*** empty log message ***

3 files changed, 9 insertions, 15 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp b/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
index 664001a98d5..717f8b9f23e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Lookup.cpp
@@ -27,9 +27,6 @@
 #include "Offer_Iterator_Collection.h"
 
 template <class TRADER>
-const char* TAO_Lookup<TRADER>::NAME = "Trader: Lookup";
-
-template <class TRADER>
 TAO_Lookup<TRADER>::TAO_Lookup (TRADER &trader)
   : trader_ (trader),
     TAO_Trader_Components<POA_CosTrading::Lookup> (trader.trading_components ()),
@@ -754,5 +751,4 @@ TAO_Lookup<TRADER>
   TAO_ENDTRY;
 }
 
-
 #endif /* TAO_LOOKUP_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Lookup.h b/TAO/orbsvcs/orbsvcs/Trader/Lookup.h
index 891f164a947..84f156fc395 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Lookup.h
@@ -28,10 +28,6 @@
 
 #include "ace/Containers.h"
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 template<class TRADER>
 class TAO_Lookup :
   public TAO_Trader_Components<POA_CosTrading::Lookup>,
@@ -149,9 +145,6 @@ public:
   // returned.
   // END SPEC
   
-  static const char* NAME;
-
-  
 private:
 
   typedef TRADER::Service_Type_Map Service_Type_Map;
@@ -307,10 +300,6 @@ private:
   // A list of recent request_id_stems 
 };
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "Lookup.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 40b4cae9126..ab096714ff4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -205,6 +205,10 @@ TAO_Trader_Factory::TAO_TRADER*
 TAO_Trader_Factory::create_linked_trader (void)
 {
   typedef TAO_Trader<ACE_Null_Mutex, ACE_Null_Mutex>  NULL_TRADER;
+
+#if defined(_MSC_VER)
+  //#pragma warning (once:4250)
+#endif /* _MSC_VER */
   
   NULL_TRADER::Trader_Components linked_trader =
     (NULL_TRADER::Trader_Components)
@@ -213,6 +217,11 @@ TAO_Trader_Factory::create_linked_trader (void)
      NULL_TRADER::ADMIN |
      NULL_TRADER::LINK);
   return new NULL_TRADER (linked_trader);
+
+#if defined(_MSC_VER)
+  //#pragma warning(default:4250)
+#endif /* _MSC_VER */
+
 }
 
 #ifdef ACE_HAS_THREADS