Fri Oct 17 17:55:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 23 insertions, 147 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index e615e1aec10..f2e8d0d86d7 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Fri Oct 17 17:55:00 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+        * orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+        * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+        * orbsvcs/orbsvcs/Trader/Trader.h
+        * orbsvcs/PSS/PSDL_Node.cpp
+        * orbsvcs/PSS/PSDL_Scope.cpp
+          Removed BCB6/BCB2006 workarounds
+
+        * orbsvcs/Trading_Service/Trading_Server.cpp
+        * orbsvcs/Trading_Service/Trading_Service.cpp
+          Layout changes
+
 Fri Oct 17 15:42:38 UTC 2008  Vladimir Zykov  <vzykov@prismtech.com>
 
         * tests/ORB_Local_Config/Bug_1459/Test.cpp:
diff --git a/TAO/orbsvcs/PSS/PSDL_Node.cpp b/TAO/orbsvcs/PSS/PSDL_Node.cpp
index d245d5191fa..2562abf32c9 100644
--- a/TAO/orbsvcs/PSS/PSDL_Node.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Node.cpp
@@ -138,10 +138,6 @@ TAO_PSDL_Specification::accept (TAO_PSDL_Node_Visitor *visitor)
   *ps_sh << "#pragma warning(pop)"; ps_sh->nl ();
   *ps_sh << "#endif /* _MSC_VER */"; ps_sh->nl ();
 
-  *ps_sh << "#if defined (__BORLANDC__)"; ps_sh->nl ();
-  *ps_sh << "#pragma option pop"; ps_sh->nl ();
-  *ps_sh << "#endif /* __BORLANDC__ */"; ps_sh->nl ();
-
   ps_sh->nl ();
 
   *ps_sh << "#endif /* ifndef */"; ps_sh->nl ();
diff --git a/TAO/orbsvcs/PSS/PSDL_Scope.cpp b/TAO/orbsvcs/PSS/PSDL_Scope.cpp
index e00f61e8f0b..0e64ffca560 100644
--- a/TAO/orbsvcs/PSS/PSDL_Scope.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Scope.cpp
@@ -640,13 +640,6 @@ TAO_PSDL_Scope::header_initialization (TAO_PSDL_Stream *ps_sh)
 
   ps_sh->nl ();
 
-  *ps_sh << "#if defined (__BORLANDC__)";
-  ps_sh->nl ();
-  *ps_sh << "#pragma option push -w-rvl -w-rch -w-ccc -w-inl";
-  ps_sh->nl ();
-  *ps_sh << "#endif /* __BORLANDC__ */";
-  ps_sh->nl ();
-
   ps_sh->nl ();
 
 }
@@ -677,13 +670,6 @@ TAO_PSDL_Scope::stub_initialization (TAO_PSDL_Stream *ps_si)
 
   ps_si->nl ();
 
-  *ps_si << "#if defined (__BORLANDC__)";
-  ps_si->nl ();
-  *ps_si << "#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig";
-  ps_si->nl ();
-  *ps_si << "#endif /* __BORLANDC__ */";
-  ps_si->nl ();
-
   ps_si->nl ();
 
   *ps_si << "#if !defined (__ACE_INLINE__)";
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
index c9edd7d053c..e8532920f93 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Server.cpp
@@ -12,8 +12,7 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 
   try
     {
-      int check =
-        trader.init (argc, argv);
+      int check = trader.init (argc, argv);
 
       if (check != -1)
         {
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index 3b644cb93bd..f1d46210ff3 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -25,13 +25,10 @@ Trading_Shutdown::Trading_Shutdown (Trading_Service& trader)
 }
 
 int
-Trading_Shutdown::handle_signal (int signum,
-                                 siginfo_t *sinfo,
-                                 ucontext_t *ucon)
+Trading_Shutdown::handle_signal (int,
+                                 siginfo_t *,
+                                 ucontext_t *)
 {
-  ACE_UNUSED_ARG (signum);
-  ACE_UNUSED_ARG (sinfo);
-  ACE_UNUSED_ARG (ucon);
   this->trader_.~Trading_Service ();
   ACE_OS::exit (0);
   return 0;
@@ -48,11 +45,9 @@ Trading_Service::~Trading_Service (void)
 }
 
 int
-Trading_Service::init (int argc,
-                       ACE_TCHAR *argv[])
+Trading_Service::init (int argc, ACE_TCHAR *argv[])
 {
-  int result_trader =
-    this->trading_loader_.init (argc, argv);
+  int const result_trader = this->trading_loader_.init (argc, argv);
 
   if (result_trader == -1)
     return -1;
@@ -65,18 +60,14 @@ Trading_Service::run (void)
 {
   Trading_Shutdown trading_shutdown (*this);
 
-  int return_value =
-    this->trading_loader_.run ();
-
-  return return_value;
+  return this->trading_loader_.run ();
 }
 
 int
 Trading_Service::shutdown (void)
 {
   // Invoke TAO_Trading_Loader::fini ()
-  int shutdown_result =
-        this->trading_loader_.fini ();
+  int const shutdown_result = this->trading_loader_.fini ();
 
   if (shutdown_result == -1)
     return -1;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index fce1e92db8e..a3d764fce8f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -12,18 +12,6 @@
 #include "ace/Vector_T.h"
 
 
-// Borland Developer Studio 2006 and earlier give a warning about comparing
-// signed and unsigned values in the minimum_polulate() and
-// initial_populate() warnings. The comparison uses a unsigned long and
-// unsigned short and it seems that the compiler promotes the unsigned
-// short of an int and this then gives the warning. Just for Borland
-// disabled the warning in this file.
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
-# pragma option push -w-csu
-# pragma nopushoptwarn
-# pragma nopackwarning
-#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */
-
 #define TODO int todo;
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -809,9 +797,3 @@ TAO::PG_Object_Group::has_member_at (const PortableGroup::Location & location)
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-// Restore original compiler flags.
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
-# pragma option pop
-# pragma nopushoptwarn
-# pragma nopackwarning
-#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index d331361bfab..8158c18d21c 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -150,23 +150,6 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos)
 {
   for (u_int i = 0; i < infos.length (); ++i)
     {
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) && defined (NDEBUG)
-      // BCB2006 and BCB6 get an internal backend error when building this
-      // code in release mode, reported to Borland as QC27961
-      RtecScheduler::RT_Info info = infos[i];
-
-      // Call the internal set method.
-      this->set (info.handle,
-                 info.criticality,
-                 info.worst_case_execution_time,
-                 info.typical_execution_time,
-                 info.cached_execution_time,
-                 info.period,
-                 info.importance,
-                 info.quantum,
-                 info.threads,
-                 info.info_type);
-#else
       // Call the internal set method.
       this->set (infos[i].handle,
                  infos[i].criticality,
@@ -178,7 +161,6 @@ ACE_Runtime_Scheduler::set_seq (const RtecScheduler::RT_Info_Set& infos)
                  infos[i].quantum,
                  infos[i].threads,
                  infos[i].info_type);
-#endif
     }
 }
 
@@ -187,23 +169,6 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos)
 {
   for (u_int i = 0; i < infos.length (); ++i)
     {
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) && defined (NDEBUG)
-      // BCB2006 and BCB6 get an internal backend error when building this
-      // code in release mode, reported to Borland as QC27961
-      RtecScheduler::RT_Info info = infos[i];
-
-      // Call the internal set method.
-      this->set (info.handle,
-                 info.criticality,
-                 info.worst_case_execution_time,
-                 info.typical_execution_time,
-                 info.cached_execution_time,
-                 info.period,
-                 info.importance,
-                 info.quantum,
-                 info.threads,
-                 info.info_type);
-#else
       // Call the internal set method.
       this->set (infos[i].handle,
                  infos[i].criticality,
@@ -215,7 +180,6 @@ ACE_Runtime_Scheduler::replace_seq (const RtecScheduler::RT_Info_Set& infos)
                  infos[i].quantum,
                  infos[i].threads,
                  infos[i].info_type);
-#endif
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index 8697e33a51f..767762cfdfb 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -660,23 +660,6 @@ set_seq (const RtecScheduler::RT_Info_Set& infos)
           rt_info_ptr->enabled_state (RtecScheduler::RT_INFO_ENABLED);
         }
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) && defined (NDEBUG)
-      // BCB2006 and BCB6 get an internal backend error when building this
-      // code in release mode, reported to Borland as QC27961
-      // Call the internal set method.
-      RtecScheduler::RT_Info info = infos[i];
-
-      this->set_i (rt_info_ptr,
-                   info.criticality,
-                   info.worst_case_execution_time,
-                   info.typical_execution_time,
-                   info.cached_execution_time,
-                   info.period,
-                   info.importance,
-                   info.quantum,
-                   info.threads,
-                   info.info_type);
-#else
       this->set_i (rt_info_ptr,
                    infos[i].criticality,
                    infos[i].worst_case_execution_time,
@@ -687,7 +670,6 @@ set_seq (const RtecScheduler::RT_Info_Set& infos)
                    infos[i].quantum,
                    infos[i].threads,
                    infos[i].info_type);
-#endif
     }
 
   // Update stability flags.  For now, just mark everything as unstable.
@@ -756,24 +738,6 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos)
           throw RtecScheduler::INTERNAL ();
         }
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) && defined (NDEBUG)
-      // BCB2006 and BCB6 get an internal backend error when building this
-      // code in release mode, reported to Borland as QC27961
-      // Call the internal set method.
-      RtecScheduler::RT_Info info = infos[i];
-
-      // Call the internal set method.
-      this->set_i (rt_info_ptr,
-                   info.criticality,
-                   info.worst_case_execution_time,
-                   info.typical_execution_time,
-                   info.cached_execution_time,
-                   info.period,
-                   info.importance,
-                   info.quantum,
-                   info.threads,
-                   info.info_type);
-#else
       // Call the internal set method.
       this->set_i (rt_info_ptr,
                    infos[i].criticality,
@@ -785,7 +749,6 @@ reset_seq (const RtecScheduler::RT_Info_Set& infos)
                    infos[i].quantum,
                    infos[i].threads,
                    infos[i].info_type);
-#endif
     }
 
   // Update stability flags.  For now, just mark everything as unstable.
@@ -869,24 +832,6 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos)
           rt_info_ptr->enabled_state (RtecScheduler::RT_INFO_ENABLED);
         }
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) && defined (NDEBUG)
-      // BCB2006 and BCB6 get an internal backend error when building this
-      // code in release mode, reported to Borland as QC27961
-      // Call the internal set method.
-      RtecScheduler::RT_Info info = infos[i];
-
-      // Call the internal set method.
-      this->set_i (rt_info_ptr,
-                   info.criticality,
-                   info.worst_case_execution_time,
-                   info.typical_execution_time,
-                   info.cached_execution_time,
-                   info.period,
-                   info.importance,
-                   info.quantum,
-                   info.threads,
-                   info.info_type);
-#else
       // Call the internal set method.
       this->set_i (rt_info_ptr,
                    infos[i].criticality,
@@ -898,7 +843,6 @@ replace_seq (const RtecScheduler::RT_Info_Set& infos)
                    infos[i].quantum,
                    infos[i].threads,
                    infos[i].info_type);
-#endif
     }
 
   // Update stability flags.  For now, just mark everything as unstable.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 5739b4a048d..69b6299895f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -132,7 +132,7 @@ private:
 class TAO_Trading_Serv_Export TAO_Lockable
 #else
 class TAO_Lockable
-#endif  /* __BORLANDC__ <= 0x593 */
+#endif  /* __BORLANDC__ <= 0x610 */
 {
 public:
   virtual ~TAO_Lockable (void);