diff options
| author | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-14 16:42:37 +0000 |
|---|---|---|
| committer | nobody <nobody@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-04-14 16:42:37 +0000 |
| commit | 25496e24b8043b7b515b3f8beb8e453fb105211c (patch) | |
| tree | f1b34a170ac61e90a3eb102b879e9d51d10336bc /TAO/tao/LocalObject.h | |
| parent | fa92d4711fb7519995b6bb9e5a16016d7326bbb0 (diff) | |
| download | ATCD-25496e24b8043b7b515b3f8beb8e453fb105211c.tar.gz | |
This commit was manufactured by cvs2svn to create tagoci_wchar_refactor_merge_in_4_14_06
'oci_wchar_refactor_merge_in_4_14_06'.
Diffstat (limited to 'TAO/tao/LocalObject.h')
| -rw-r--r-- | TAO/tao/LocalObject.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index ebaabba991a..e7c3c8dce70 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -29,9 +29,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/Object.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Object.h" namespace CORBA { @@ -42,6 +40,9 @@ namespace CORBA /** * @class LocalObject + * + * @note NW: It is not clear whether minimum CORBA should support + * LocalObject or not. I think it should. */ class TAO_Export LocalObject : public virtual CORBA::Object { @@ -222,9 +223,6 @@ class TAO_Export TAO_Local_RefCounted_Object { public: - /// Destructor. - virtual ~TAO_Local_RefCounted_Object (void); - /// Increment reference count. virtual void _add_ref (void); @@ -256,10 +254,9 @@ protected: ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) -# include "tao/LocalObject.i" +# include "LocalObject.i" #endif /* __ACE_INLINE__ */ #include /**/ "ace/post.h" |