ChangeLogTag: Wed Dec 21 19:17:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 14 insertions, 78 deletions

diff --git a/ChangeLog b/ChangeLog
index 3431b0b88cb..dff42a9ad33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 21 19:17:12 UTC 2005  Johnny Willemsen <jwillemsen@remedy.nl>
+
+        * netsvcs/clients/Naming/Client/Client_Test.cpp:
+          Replaced assert with ACE_ERROR
+
 Wed Dec 21 19:14:12 UTC 2005  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * bin/MakeProjectCreator/config/vc8nmake.mpb:
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index 6389a04c776..f5d171a3b4f 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -1000,7 +1000,7 @@ RR_Object_Group::unbind (const char *id
   this->allocator_->free (iter.next ());
   iter.remove ();
 
-  int curr_size = this->members_->current_size ();
+  size_t curr_size = this->members_->current_size ();
 
   // Update <next_> if necessary to reflect the deletion.
   if (position < next_)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 79650d1c7aa..6585591bbd0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -29,7 +29,6 @@ TAO_EC_Simple_Queue_Full_Action::TAO_EC_Simple_Queue_Full_Action (void)
 int
 TAO_EC_Simple_Queue_Full_Action::init_svcs (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Simple_Queue_Full_Action::init_svcs()\n"));
   return ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_TAO_EC_Simple_Queue_Full_Action);
 }
@@ -106,7 +105,7 @@ TAO_EC_Dispatching_Task::svc (void)
     {
       ACE_TRY_NEW_ENV
         {
-          ACE_Message_Block *mb;
+          ACE_Message_Block *mb = 0;
           if (this->getq (mb) == -1)
             if (ACE_OS::last_error () == ESHUTDOWN)
               return 0;
@@ -175,11 +174,7 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
                                    event,
                                    this->data_block_.duplicate (),
                                    this->allocator_);
-  ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): task %@ queue size before putq: %d\n",
-              this, this->the_queue_.message_count ()));
   this->putq (mb);
-  ACE_DEBUG ((LM_DEBUG, "EC (%P|%t): task %@ queue size after putq: %d\n",
-              this, this->the_queue_.message_count ()));
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index de7d07db7cb..b3a06759b84 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -108,7 +108,7 @@ int
 TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr)
 {
   // The following is a selective reproduction of TAO_Profile::decode
-  
+
   CORBA::ULong encap_len = cdr.length ();
 
   // Read and verify major, minor versions, ignoring profiles
@@ -151,7 +151,7 @@ TAO_UIPMC_Profile::decode (TAO_InputCDR& cdr)
                   encap_len));
     }
 
-  // We don't call ::decode_endpoints because it is implemented 
+  // We don't call ::decode_endpoints because it is implemented
   // as ACE_NOTSUP_RETURN (-1) for this profile
 
   return 1;
@@ -275,7 +275,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
   ACE_CString ace_str (string, 0, 0);
 
   // Look for the group domain delimitor.
-  int pos = ace_str.find ('-');
+  ssize_t pos = ace_str.find ('-');
 
   if (pos == ACE_CString::npos)
     {
@@ -296,7 +296,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
 
   // Skip past the last '-'.
   pos++;
-  int end_pos = ace_str.find ('-',pos);
+  ssize_t end_pos = ace_str.find ('-',pos);
 
   CORBA::Boolean parse_group_ref_version_flag = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index b109d14ab56..8b64c675a18 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -122,8 +122,7 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
 
               // Reference the associated scheduling entry: the double cast is
               // needed to ensure that the size of the pointer and the size of the
-              // stored magic cookie are the same (see the definition of
-              // ptr_arith_t in ACE to grok how this works portably).
+              // stored magic cookie are the same
               next_rse =
                 ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
                                      next_rt_info->volatile_token);
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
index 1388583a710..8f59b7fb8d4 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -43,9 +43,8 @@ namespace TAO
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
         active_object_map_entry_ (0)
     {
-      TAO_Adapter *adapter = oc->poa_adapter ();
       TAO_Object_Adapter *object_adapter =
-        dynamic_cast<TAO_Object_Adapter *>(adapter);
+        dynamic_cast<TAO_Object_Adapter *>(oc->poa_adapter ());
       this->object_adapter_ = object_adapter;
     }
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 4df9d46e779..ccc3c2259a1 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -19,8 +19,6 @@
 
 #include /**/ "ace/pre.h"
 
-// "ace/OS.h" is overkill.  "ace/Basic_Types.h" is enough.  In
-// particular, it is needed for the definition of ACE_LITTLE_ENDIAN.
 #include "ace/Basic_Types.h"
 #include "ace/Global_Macros.h"
 #include "ace/Synch_Traits.h"
@@ -163,36 +161,10 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #define TAO_MAXBUFSIZE 1024
 #endif /* TAO_MAXBUFSIZE */
 
-/*!
-
-  The number of times the transport will try to re-read before
-  returning control to the reactor when it has an uncompleted
-  message (see TAO_Transport::handle_input()).
-
-  The idea behind re-reading is that more data may have arrived
-  while the transport was busy deciding what to do with the bytes
-  it got, so we should probably try to re-read.
-
-  This value shouldn't be too large, lest the transport starve
-  out other transports while trying to complete its message.
-
-  When choosing a value, think of the type of this as 'unsigned int'.
- */
-#if !defined(TAO_MAX_TRANSPORT_REREAD_ATTEMPTS)
-#define TAO_MAX_TRANSPORT_REREAD_ATTEMPTS 2
-#endif
-
-// This controls the alignment for TAO structs.  It supports built-in
-// types up to and including 16 bytes (128 bits) in size.
-#if !defined (TAO_MAXIMUM_NATIVE_TYPE_SIZE)
-# define TAO_MAXIMUM_NATIVE_TYPE_SIZE 128
-#endif /* TAO_MAXIMUM_NATIVE_TYPE_SIZE */
-
 #if !defined (TAO_CONNECTION_PURGING_STRATEGY)
 # define TAO_CONNECTION_PURGING_STRATEGY TAO_Resource_Factory::LRU
 #endif /* TAO_CONNECTION_PURGING_STRATEGY */
 
-
 #if !defined (TAO_PURGE_PERCENT)
 # define TAO_PURGE_PERCENT 20
 #endif /* TAO_PURGE_PERCENT */
@@ -214,10 +186,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #   define TAO_NAMESPACE_INLINE_FUNCTION TAO_NAMESPACE_STORAGE_CLASS
 # endif
 
-// Instead of replacing this with the ACE macro
-// in 20+ files, define it conditionally.
-// The TAO_OutputCDR class uses the ACE macro, which
-// is defined by default.
 #if !defined(TAO_NO_COPY_OCTET_SEQUENCES)
 # define TAO_NO_COPY_OCTET_SEQUENCES 1
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES */
@@ -247,7 +215,7 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 // byte first.
 
 // @todo It seems to be that this definition of TAO_ENCAP_BYTE_ORDER
-// should be  removed. We have an equivalent ACE definition in
+// should be removed. We have an equivalent ACE definition in
 // ACE_CDR_BYTE_ORDER. Today both of them are consistent. It would be
 // a havoc if oneday this consistency is gone..
 #if defined (ACE_LITTLE_ENDIAN)
@@ -292,36 +260,6 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 #  pragma warning (disable:4355) /* disable C4355 warning */
 #endif /* defined (_MSC_VER) */
 
-// The IDL compiler can generate the classes corresponding to IDL
-// sequences in two ways:
-// + Use the TAO templates for sequences,
-//   i.e. TAO_{Unb,B}ounded_Sequence<>
-// + Explicitly generate code for the sequence.
-//
-// The first approach can (potentially) produce smaller code, because
-// the code for a sequence over a particular type (say sequence<long>)
-// can be shared across multiple IDL files.
-// Unfortunately it is hard to manage the template instantiations on
-// platforms that do not automatically generate them, mainly because
-// it is hard to decide on which generated file are the templates
-// instantiated.  Thus the second approach is more convenient for most
-// applications.
-//
-// On platforms that support automatic template instantiation we use
-// the first approach.
-// On platforms that require explicit template instantiations we use
-// explicitly generated code for sequences if the platform does not.
-// If the application requires it (such as embedded systems) the
-// default can be changed, but then the application developer is
-// responsible for instantiating the templates.
-//
-#if defined (AIX) || \
-    (!defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \
-     (defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \
-      (defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) && defined (_UNICOS))))
-#define TAO_USE_SEQUENCE_TEMPLATES
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // The Root POA default name.
 #if !defined (TAO_DEFAULT_ROOTPOA_NAME)
 #define TAO_DEFAULT_ROOTPOA_NAME   "RootPOA"