diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index 6c86c7a4840..ece1de9a961 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +/* -*- C++ -*- */ //============================================================================= /** @@ -17,17 +17,15 @@ #define TAO_TRADER_INTERFACES_H #include /**/ "ace/pre.h" -#include "orbsvcs/Trader/Trader_Utils.h" -#include "orbsvcs/Trader/Constraint_Interpreter.h" -#include "orbsvcs/Trader/Offer_Iterators_T.h" +#include "Trader_Utils.h" +#include "Constraint_Interpreter.h" +#include "Offer_Iterators_T.h" #if defined(_MSC_VER) #pragma warning(push) #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - // Hack because g++ forced this inane circular dependecy! class TAO_Constraint_Interpreter; @@ -41,11 +39,7 @@ template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Admin; template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Proxy; template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> class TAO_Link; -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/Trader/Trader_T.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL +#include "Trader_T.h" /** * @class TAO_Lookup @@ -1005,10 +999,8 @@ private: TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "orbsvcs/Trader/Trader_Interfaces.cpp" +#include "Trader_Interfaces.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) |