diff options
author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-20 09:46:10 +0000 |
---|---|---|
committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-20 09:46:10 +0000 |
commit | 02686f8d5108580e8a3d56bfe9b124405fdedd18 (patch) | |
tree | 0426ac218b7505e1c06dbf5ff8d2b10144d7ce75 /TAO/tao/Object.h | |
parent | b2334408ebeffc6686b1f976247926df8411caec (diff) | |
download | ATCD-02686f8d5108580e8a3d56bfe9b124405fdedd18.tar.gz |
Tue Oct 20 09:30:13 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'TAO/tao/Object.h')
-rw-r--r-- | TAO/tao/Object.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 932cff0dfc7..59ae911e3e0 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -306,15 +306,6 @@ namespace CORBA /// Accessor to the flag.. CORBA::Boolean is_evaluated (void) const; - /// Mutator for setting the servant in collocated cases. - /** - * This is used by the Object_Adapter to set the servant for - * collocated cases and only when the object is initialized. The - * object initialization takes place when IOR's are lazily - * evaluated. - */ - void set_collocated_servant (TAO_Abstract_ServantBase *); - /// Accessor for the ORB_Core.. TAO_ORB_Core *orb_core (void) const; @@ -339,8 +330,7 @@ namespace CORBA virtual char* convert_to_ior (bool use_omg_ior_format, const char* ior_prefix) const; - /// Wrapper for _remove_ref(), naming convention for - /// templatizing. + /// Wrapper for _remove_ref(), naming convention for templatizing. void _decr_refcount (void); protected: |