diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h index 0d4a61f123f..7bd568a592a 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h @@ -1,5 +1,4 @@ -// -*- C++ -*- - +/* -*- C++ -*- */ //============================================================================= /** * @file Naming_Service_Container.h @@ -22,21 +21,17 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/orbconf.h" - // Need by ACE_DLList_Node. #include "ace/Containers.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Allocator; -ACE_END_VERSIONED_NAMESPACE_DECL -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +// Forward declarations. template <class T> class ACE_Unbounded_List; template <class T> class ACE_Unbounded_List_Iterator; + /** * @class ACE_NS_Node * @@ -49,6 +44,8 @@ public: friend class ACE_Unbounded_List<T>; friend class ACE_Unbounded_List_Iterator<T>; + + # if ! defined (ACE_HAS_BROKEN_NOOP_DTORS) /// This isn't necessary, but it keeps some compilers happy. ~ACE_NS_Node (void); @@ -67,6 +64,10 @@ private: T item_; }; + + + + /** * @class ACE_Unbounded_List_Iterator * @@ -220,10 +221,9 @@ private: ACE_Allocator *allocator_; }; -TAO_END_VERSIONED_NAMESPACE_DECL #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Naming/Naming_Service_Container.cpp" +#include "Naming_Service_Container.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) |