diff options
| -rw-r--r-- | CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp index fc74c133df2..099cb637dea 100644 --- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp @@ -72,7 +72,9 @@ namespace CIAO endpoint_reference = out; if (this->is_local_connection (conn)) - (*out) <<= comp.in (); + { + (*out) <<= comp.in (); + } else { switch (conn.internalEndpoint[i].kind) diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 98fc684daff..3940142bbfa 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -189,7 +189,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// A little helper class to get around the TAO_Singleton::instance () /// inability to pass default initialization arguments to the /// singleton ctor. - class TAO_Ubergestalt_Ready_Condition : public ACE_SYNCH_RECURSIVE_CONDITION { @@ -205,7 +204,6 @@ public: { } - private: /// The mutex, associated with the condition. Do not use the ACE /// global mutex, because it causes deadlocks with other threads that @@ -214,9 +212,6 @@ private: }; #endif // ACE_HAS_THREADS - - - // **************************************************************** /// Note that the argument vector will be corrupted upon return int |