summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Trader/Trader.cpp')
-rw-r--r--TAO/orbsvcs/orbsvcs/Trader/Trader.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 14d035ee0e5..2743d67bbdf 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -1,7 +1,7 @@
// $Id$
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Offer_Iterators_T.h"
+#include "Trader.h"
+#include "Offer_Iterators_T.h"
#include "ace/Thread_Mutex.h"
#include "ace/RW_Thread_Mutex.h"
#include "ace/OS_NS_strings.h"
@@ -9,14 +9,12 @@
#include "ace/OS_NS_ctype.h"
// The following #include is needed only for the instantiation pragmas.
-#include "orbsvcs/Trader/Trader_Interfaces.h"
+#include "Trader_Interfaces.h"
ACE_RCSID (Trader,
Trader,
"$Id$")
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
TAO_Trader_Base::TAO_Trader_Base (void)
: trading_components_ (*this),
import_attributes_ (*this),
@@ -634,12 +632,8 @@ operator== (const CosTrading::Admin::OctetSeq& left,
return return_value;
}
-TAO_END_VERSIONED_NAMESPACE_DECL
-
#include "ace/Arg_Shifter.h"
-#include "orbsvcs/Trader/Trader_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Trader_T.h"
TAO_Trader_Factory::TAO_TRADER*
TAO_Trader_Factory::create_trader (int& argc, ACE_TCHAR** argv)
@@ -862,5 +856,3 @@ TAO_Trader_Factory::parse_args (int& argc, ACE_TCHAR** argv)
arg_shifter.ignore_arg ();
}
}
-
-TAO_END_VERSIONED_NAMESPACE_DECL