diff options
-rw-r--r-- | TAO/ChangeLog | 6 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Object_Adapter.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp | 1 | ||||
-rw-r--r-- | TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp | 3 | ||||
-rw-r--r-- | TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp | 1 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Root_POA.cpp | 5 | ||||
-rw-r--r-- | TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp | 5 | ||||
-rw-r--r-- | TAO/utils/catior/catior.cpp | 1 |
9 files changed, 20 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1a88b043900..98073020f55 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 28 08:57:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp: + Removed incorrect ; at end of method + Tue Dec 27 22:50:22 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Makefile.am: @@ -188,7 +193,6 @@ Tue Dec 27 08:22:42 2005 Phil Mesnier <mesnier_p@ociweb.com> The alternate IIOP test now uses the Optimized Connection Endpoint Selector to speed up the selection of the correct endpoint. - Tue Dec 27 09:18:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/FlResource_Loader.h: diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 64b092c92a8..53f866ef536 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -15,6 +15,8 @@ // -- ACE Include -- #include "ace/Auto_Ptr.h" +#include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" // -- TAO Include -- #include "tao/PortableInterceptorC.h" @@ -37,8 +39,6 @@ # include "Object_Adapter.i" #endif /* __ACE_INLINE__ */ -#include "ace/OS_NS_string.h" - #include "ThreadPolicy.h" #include "LifespanPolicy.h" #include "IdAssignmentPolicy.h" diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp index 500e9ce9e1f..fe597b0882e 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp @@ -4,6 +4,7 @@ #include "RequestProcessingStrategy.h" #include "RequestProcessingStrategyAOMOnly.h" #include "ace/Dynamic_Service.h" +#include "ace/Log_Msg.h" ACE_RCSID (PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl, diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp index c76c77908e1..3fbd8677bcf 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp @@ -4,9 +4,10 @@ #include "RequestProcessingStrategy.h" #include "RequestProcessingStrategyDefaultServant.h" #include "ace/Dynamic_Service.h" +#include "ace/Log_Msg.h" ACE_RCSID (PortableServer, - RequestProcessingStrategyDefaultServantFactoryImpl, + RequestProcessingStrategyDefaultServantFI, "$Id$") #if (TAO_HAS_MINIMUM_POA == 0) diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp index 01c5f35a8cd..2d016cce17d 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp @@ -6,6 +6,7 @@ #include "RequestProcessingStrategyServantLocator.h" #include "RequestProcessingStrategyServantActivator.h" #include "ace/Dynamic_Service.h" +#include "ace/Log_Msg.h" ACE_RCSID (PortableServer, RequestProcessingStrategyFactoryImpl, diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 9fe19884ee3..b33be6b8125 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -53,14 +53,15 @@ #include "ace/OS_NS_netdb.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" +#include "ace/Log_Msg.h" #if !defined (__ACE_INLINE__) # include "Root_POA.inl" #endif /* ! __ACE_INLINE__ */ ACE_RCSID (PortableServer, - POA, - "$Id$") + Root_POA, + "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp index 3df8ea977c1..86e78ded029 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp @@ -54,7 +54,7 @@ TAO_Optimized_Connection_Endpoint_Selector::hook (TAO_ORB_Core *, timeout_ > ACE_Time_Value::zero; if (has_timeout) tv = TAO_Optimized_Connection_Endpoint_Selector::timeout_; -}; +} int TAO_Optimized_Connection_Endpoint_Selector::check_profile (TAO_Profile *p, diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp index a6bba4bb7a6..77632341cb7 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp @@ -17,8 +17,11 @@ #include "TypeCodeFactory_Loader.h" #include "TypeCodeFactory_i.h" +#include "ace/Log_Msg.h" -ACE_RCSID(TypeCodeFactory, TypeCodeFactory_Loader, "$Id$") +ACE_RCSID(TypeCodeFactory, + TypeCodeFactory_Loader, + "$Id$") TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index edc5ec3e18e..e673b19c2e7 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -24,6 +24,7 @@ #include "ace/OS_NS_ctype.h" #include "ace/OS_NS_stdio.h" #include "ace/Argv_Type_Converter.h" +#include "ace/Log_Msg.h" #include "tao/corba.h" #include "tao/IIOP_Profile.h" #include "tao/Messaging_PolicyValueC.h" |