diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 09:10:19 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-19 09:10:19 +0000 |
| commit | 97a7e757bb6e4415487770614266e114b2f3c3b7 (patch) | |
| tree | a681f895cf5a9b8a4f7ab6603ee4fd3a55ca0305 /TAO/tao/Object.cpp | |
| parent | e1e3a5aa98d33f78395624a2e57d173a8e738de6 (diff) | |
| download | ATCD-97a7e757bb6e4415487770614266e114b2f3c3b7.tar.gz | |
ChangeLogTag: Wed Apr 19 07:44:49 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Object.cpp')
| -rw-r--r-- | TAO/tao/Object.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 3b5b83c9c8d..0df3b311b58 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -32,7 +32,6 @@ ACE_RCSID (tao, Object, "$Id$") - TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Object::~Object (void) @@ -148,7 +147,7 @@ void CORBA::Object::_tao_any_destructor (void *x) { CORBA::Object_ptr tmp = static_cast<CORBA::Object_ptr> (x); - CORBA::release (tmp); + ::CORBA::release (tmp); } // virtual -- do not inline @@ -994,7 +993,7 @@ namespace TAO void Objref_Traits<CORBA::Object>::release (CORBA::Object_ptr p) { - CORBA::release (p); + ::CORBA::release (p); } CORBA::Object_ptr @@ -1004,7 +1003,7 @@ namespace TAO } CORBA::Boolean - Objref_Traits<CORBA::Object>::marshal (CORBA::Object_ptr p, + Objref_Traits<CORBA::Object>::marshal (const CORBA::Object_ptr p, TAO_OutputCDR & cdr) { return p->marshal (cdr); |