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, 14 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h index ece1de9a961..6c86c7a4840 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h @@ -1,4 +1,4 @@ -/* -*- C++ -*- */ +// -*- C++ -*- //============================================================================= /** @@ -17,15 +17,17 @@ #define TAO_TRADER_INTERFACES_H #include /**/ "ace/pre.h" -#include "Trader_Utils.h" -#include "Constraint_Interpreter.h" -#include "Offer_Iterators_T.h" +#include "orbsvcs/Trader/Trader_Utils.h" +#include "orbsvcs/Trader/Constraint_Interpreter.h" +#include "orbsvcs/Trader/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; @@ -39,7 +41,11 @@ 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; -#include "Trader_T.h" +TAO_END_VERSIONED_NAMESPACE_DECL + +#include "orbsvcs/Trader/Trader_T.h" + +TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_Lookup @@ -999,8 +1005,10 @@ private: TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_; }; +TAO_END_VERSIONED_NAMESPACE_DECL + #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "Trader_Interfaces.cpp" +#include "orbsvcs/Trader/Trader_Interfaces.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ #if defined(_MSC_VER) |