diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-17 13:38:23 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-17 13:38:23 +0000 |
| commit | 1a7823728ebb1e578b85023ab6e7538541ffdfb2 (patch) | |
| tree | 849f817197d9e01b2be6de8bf0b38b2041791f96 | |
| parent | 939916bda1113594cc5bafd64548e9bddc2174ec (diff) | |
| download | ATCD-1a7823728ebb1e578b85023ab6e7538541ffdfb2.tar.gz | |
ChangeLogTag: Wed Aug 17 12:39:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/AnyTypeCode/Union_TypeCode.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Any_Insert_Policy_T.h | 2 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Upcall_Wrapper.cpp | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp index ad3a104db41..20c609c44ac 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp @@ -281,8 +281,6 @@ TAO::TypeCode::Union<StringType, // ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ()); - - ACE_NOTREACHED (return CORBA::TypeCode::_nil ()); } template <typename StringType, diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h index 0eb690daa2c..d2a695673bd 100644 --- a/TAO/tao/Any_Insert_Policy_T.h +++ b/TAO/tao/Any_Insert_Policy_T.h @@ -60,7 +60,7 @@ namespace TAO { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("ERROR: nable to find AnyTypeCode Adapter "))); + ACE_TEXT ("ERROR: unable to find AnyTypeCode Adapter "))); } } }; diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp index 3f4667bb1e5..8443f73dd0e 100644 --- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp @@ -53,10 +53,6 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request, ACE_TRY { { -// @todo, PICurrent_Guard makes PortableServer dependent on PI, use the adapter with an auto_ptr. -// TAO::PICurrent_Guard pi_guard (server_request, -// true /* Copy TSC to RSC */); - if (interceptor_adapter != 0) { // Invoke intermediate server side interception points. |