diff options
| -rw-r--r-- | TAO/ChangeLog-99c | 6 | ||||
| -rw-r--r-- | TAO/examples/POA/Adapter_Activator/server.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/OctetSeq/test_i.cpp | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 6ad2198b094..fa82f21f327 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,9 @@ +Fri Jun 18 10:07:09 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * examples/POA/Adapter_Activator/server.cpp: + * tests/OctetSeq/test_i.cpp: + Fixed minor syntax errors. + Thu Jun 17 23:43:25 1999 Irfan Pyarali <irfan@cs.wustl.edu> * examples/POA/Adapter_Activator/server.cpp: Fixed servant leak by diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp index 475b99670df..6e8445b6811 100644 --- a/TAO/examples/POA/Adapter_Activator/server.cpp +++ b/TAO/examples/POA/Adapter_Activator/server.cpp @@ -119,7 +119,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, // This means that the ownership of <foo_impl> now belongs to // the POA. foo_impl->_remove_ref (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK_RETURN (0); // Finally everything is fine return 1; @@ -156,7 +156,7 @@ Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, // This means that the ownership of <foo_impl> now belongs to // the POA. foo_impl->_remove_ref (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK_RETURN (0); // Finally everything is fine return 1; diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp index 6a753362db8..dd661e98ebd 100644 --- a/TAO/tests/OctetSeq/test_i.cpp +++ b/TAO/tests/OctetSeq/test_i.cpp @@ -38,12 +38,12 @@ Database_i::get (Test::Index i, if (i >= this->max_range_) ACE_THROW_RETURN (Test::OutOfRange (0, this->max_range_), 0); - Test::OctetSeq_var copy; + Test::OctetSeq* copy; ACE_NEW_THROW_EX (copy, Test::OctetSeq (this->elements_[i]), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); - return copy._retn (); + return copy; } CORBA::ULong |