Disposed of the last NT warnings!

10 files changed, 17 insertions, 23 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h
index 25e4c4ccb63..e0eb3062bb2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Evaluator.h
@@ -21,8 +21,6 @@
 #include "Constraint_Visitor.h"
 #include "Constraint_Nodes.h"
 
-#include "orbsvcs/SequencesC.h"
-
 class TAO_Constraint_Evaluator : public TAO_Constraint_Visitor
 //
 // = TITLE
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index e5b922084af..29544b3ddd6 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -23,6 +23,10 @@
 #include "orbsvcs/CosTradingC.h"
 #include "orbsvcs/SequencesC.h"
 
+#if defined(_MSC_VER)
+#pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
 typedef unsigned short TAO_Expression_Type;
 
 class TAO_Constraint
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
index 63e86e23811..58fe5ed1ab2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
@@ -19,7 +19,6 @@
 #define TAO_DYNAMIC_PROPERTY_H
 
 #include "Trader.h"
-#include "orbsvcs/CosTradingS.h"
 
 class TAO_DP_Evaluation_Handler
 {
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Lookup.h b/TAO/orbsvcs/orbsvcs/Trader/Lookup.h
index 4346ab17362..e9854f5dba6 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>,
@@ -310,8 +306,4 @@ private:
 #include "Lookup.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-#if defined(_MSC_VER)
-//#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 #endif /* TAO_LOOKUP_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.h
index 17202206dec..63520656362 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Id_Iterator.h
@@ -17,9 +17,12 @@
 #ifndef TAO_OFFER_ID_ITERATOR_H
 #define TAO_OFFER_ID_ITERATOR_H
 
-#include "ace/Containers.h"
 #include "orbsvcs/CosTradingS.h"
 
+#if defined(_MSC_VER)
+#pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
 class TAO_Offer_Id_Iterator : public POA_CosTrading::OfferIdIterator
 // = TITLE
 //   Silly little iterator that contains the overflow of offer ids
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h
index f5cf17eec21..a94efca7235 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterator_Collection.h
@@ -19,6 +19,10 @@
 
 #include "orbsvcs/CosTradingS.h"
 
+#if defined(_MSC_VER)
+#pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
 class TAO_Offer_Iterator_Collection : public POA_CosTrading::OfferIterator
 // = TITLE
 //   A collection of offer iterator to query in turn.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h b/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h
index 98e6e53d89c..bfad3882a42 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h
@@ -17,7 +17,6 @@
 #ifndef TAO_POLICY_MANAGER_H
 #define TAO_POLICY_MANAGER_H
 
-#include "orbsvcs/CosTradingC.h"
 #include "Policies.h"
 
 class TAO_Policy_Manager
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
index 87bada5a054..06140f96b07 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
@@ -18,7 +18,6 @@
 #define TAO_PROPERTY_EVALUATOR_H
 
 #include "Trader.h"
-#include "orbsvcs/CosTradingC.h"
 
 class TAO_Property_Evaluator
 //
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 72d74332aec..bd9df0d9f2d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -205,10 +205,6 @@ 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)
@@ -217,11 +213,6 @@ 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 */
-
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index 7ab33c4fc4b..545f3f2eca5 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -19,6 +19,11 @@
 #define TAO_TRADER_C
 
 #include "Trader_T.h"
+
+#if defined(_MSC_VER)
+#pragma warning (disable:4250)
+#endif /* _MSC_VER */
+
 #include "Lookup.h"
 #include "Register.h"
 #include "Link.h"