summaryrefslogtreecommitdiff
path: root/TAO/tao/RTPortableServer
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-04-19 09:45:01 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-04-19 09:45:01 +0000
commit8e6d2b3638898ca921939762c0934d1be7da3b23 (patch)
tree95a7bfd2ae5dbe44cfe36766ed6f76097489cf4c /TAO/tao/RTPortableServer
parentbe940eef5758561869db96ab820fb21774e3942f (diff)
downloadATCD-8e6d2b3638898ca921939762c0934d1be7da3b23.tar.gz
ChangeLogTag: Wed Apr 19 07:44:49 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/RTPortableServer')
-rw-r--r--TAO/tao/RTPortableServer/RTPortableServerC.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 85e9834111f..faca5cb2fcd 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -67,7 +67,7 @@ TAO::Objref_Traits<RTPortableServer::POA>::release (
RTPortableServer::POA_ptr p
)
{
- CORBA::release (p);
+ ::CORBA::release (p);
}
RTPortableServer::POA_ptr
@@ -91,12 +91,12 @@ RTPortableServer::POA::POA (void)
RTPortableServer::POA::~POA (void)
{}
-void
+void
RTPortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
{
POA *_tao_tmp_pointer =
static_cast<POA *> (_tao_void_pointer);
- CORBA::release (_tao_tmp_pointer);
+ ::CORBA::release (_tao_tmp_pointer);
}
RTPortableServer::POA_ptr
@@ -109,10 +109,10 @@ RTPortableServer::POA::_narrow (
{
return POA::_nil ();
}
-
+
POA_ptr proxy =
dynamic_cast<POA_ptr> (_tao_objref);
-
+
return POA::_duplicate (proxy);
}
@@ -126,28 +126,28 @@ RTPortableServer::POA::_unchecked_narrow (
{
return POA::_nil ();
}
-
+
POA_ptr proxy =
dynamic_cast<POA_ptr> (_tao_objref);
-
+
return POA::_duplicate (proxy);
}
RTPortableServer::POA_ptr
RTPortableServer::POA::_duplicate (POA_ptr obj)
{
- if (! CORBA::is_nil (obj))
+ if (! ::CORBA::is_nil (obj))
{
obj->_add_ref ();
}
-
+
return obj;
}
void
RTPortableServer::POA::_tao_release (POA_ptr obj)
{
- CORBA::release (obj);
+ ::CORBA::release (obj);
}
CORBA::Boolean