summaryrefslogtreecommitdiff
path: root/TAO/tao/Object.i
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Object.i')
-rw-r--r--TAO/tao/Object.i16
1 files changed, 5 insertions, 11 deletions
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index e86207df933..0db6581b912 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -4,12 +4,11 @@
// ****************************************************************
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
ACE_INLINE
CORBA::Object::Object (int)
- : servant_ (0),
- proxy_broker_ (0),
- is_collocated_ (false),
- is_local_ (true),
+ : is_local_ (true),
is_evaluated_ (true),
ior_ (),
orb_core_ (0),
@@ -80,13 +79,6 @@ CORBA::Object::is_evaluated (void) const
return this->is_evaluated_;
}
-ACE_INLINE void
-CORBA::Object::set_collocated_servant (TAO_Abstract_ServantBase *b)
-{
- this->servant_ = b;
- this->is_collocated_ = 1;
-}
-
ACE_INLINE TAO_ORB_Core *
CORBA::Object::orb_core (void) const
{
@@ -104,3 +96,5 @@ CORBA::Object::ior (void) const
{
return this->ior_.in ();
}
+
+TAO_END_VERSIONED_NAMESPACE_DECL