summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-05-07 21:42:17 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-05-07 21:42:17 +0000
commitd02f0fa16067639e2b449ea5d3d8b8923f247a76 (patch)
tree17f16afeb300c174bd81875788d8b1d9a291eff1
parent17309bf9d7e136a4f84e796fda1c119b8fb172b8 (diff)
downloadATCD-d02f0fa16067639e2b449ea5d3d8b8923f247a76.tar.gz
ChangeLogTag:Wed May 7 16:41:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog5
-rw-r--r--TAO/CIAO/ciao/ComponentServer_Impl.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 1ed3ac68208..0b7c152bb7f 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 7 16:41:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * ciao/ComponentServer_Impl.cpp (remove_container): Fixed warnings
+ with g++ builds.
+
Wed May 7 16:36:15 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* ciao/CCM_Core.mpc: Added missing libraries that were essential
diff --git a/TAO/CIAO/ciao/ComponentServer_Impl.cpp b/TAO/CIAO/ciao/ComponentServer_Impl.cpp
index f5501a71c21..e10a9ce31e0 100644
--- a/TAO/CIAO/ciao/ComponentServer_Impl.cpp
+++ b/TAO/CIAO/ciao/ComponentServer_Impl.cpp
@@ -132,7 +132,7 @@ CIAO::ComponentServer_Impl::remove_container (Components::Deployment::Container_
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- this->poa_->deactivate_object (oid
+ this->poa_->deactivate_object (oid.in ()
ACE_ENV_ARG_PARAMETER);
ACE_CHECK;