Eliminated warnings of dominance by the NT compiler by, er, using pragmas.

9 files changed, 14 insertions, 15 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Attributes.h b/TAO/orbsvcs/orbsvcs/Trader/Attributes.h
index ad78cd410a4..14d21466ffa 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Attributes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Attributes.h
@@ -31,7 +31,6 @@ public:
   virtual ACE_Lock& lock (void) = 0;  
 };
 
-
 class TAO_ORBSVCS_Export TAO_Support_Attributes_Impl
   // = TITLE
   //     This class stores, allows access to and modification of 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Attributes_T.h b/TAO/orbsvcs/orbsvcs/Trader/Attributes_T.h
index 0e4c0cf138d..74da9f22814 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Attributes_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Attributes_T.h
@@ -20,7 +20,7 @@
 #include "Attributes.h"
 
 template <class IF>
-class TAO_ORBSVCS_Export TAO_Trader_Components : public virtual IF
+class TAO_Trader_Components : public virtual IF
 {
 public:
 
@@ -58,7 +58,7 @@ private:
 };
 
 template <class IF>
-class TAO_ORBSVCS_Export TAO_Support_Attributes : public virtual IF
+class TAO_Support_Attributes : public virtual IF
 {
 public:
 
@@ -84,7 +84,7 @@ private:
 };
 
 template <class IF>
-class TAO_ORBSVCS_Export TAO_Import_Attributes : public virtual IF
+class TAO_Import_Attributes : public virtual IF
 {
 public:
 
@@ -142,7 +142,7 @@ private:
 };
 
 template <class IF>
-class TAO_ORBSVCS_Export TAO_Link_Attributes : public virtual IF
+class TAO_Link_Attributes : public virtual IF
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
index 58fe5ed1ab2..529349d3982 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Dynamic_Property.h
@@ -20,7 +20,7 @@
 
 #include "Trader.h"
 
-class TAO_DP_Evaluation_Handler
+class TAO_ORBSVCS_Export TAO_DP_Evaluation_Handler
 {
 public:
 
@@ -31,7 +31,7 @@ public:
   
 };
 
-class TAO_DP_Dispatcher :
+class TAO_ORBSVCS_Export TAO_DP_Dispatcher :
   public POA_CosTradingDynamic::DynamicPropEval
 // = TITLE
 //   This class exhibits one strategy for handling many dynamic
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h b/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h
index bfad3882a42..ed2318381ca 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Policy_Manager.h
@@ -19,7 +19,7 @@
 
 #include "Policies.h"
 
-class TAO_Policy_Manager
+class TAO_ORBSVCS_Export TAO_Policy_Manager
 // = TITLE
 //
 // This class is a utility for clients using the CosTrading::Lookup
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
index 06140f96b07..f95fa7acdda 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Property_Evaluator.h
@@ -19,7 +19,7 @@
 
 #include "Trader.h"
 
-class TAO_Property_Evaluator
+class TAO_ORBSVCS_Export TAO_Property_Evaluator
 //
 // = TITLE
 //   This class abstracts away the details of obtaining property
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.h b/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.h
index cf65705616b..318217e2cdd 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Query_Only_Offer_Iterator.h
@@ -21,7 +21,7 @@
 #include "ace/Containers.h"
 #include "Offer_Iterator.h"
 
-class TAO_ORBSVCS_Export TAO_Query_Only_Offer_Iterator
+class TAO_Query_Only_Offer_Iterator
   : public TAO_Offer_Iterator
   // = TITLE
   //     An implementation of the CosTrading::OfferIterator IDL
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index 9f57aecfc28..39a43519eee 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -22,8 +22,8 @@ TAO_Service_Type_Repository::
 TAO_Service_Type_Repository (ACE_Lock* lock)
   : lock_ (lock)
 {
-  incarnation_.low = 0;
-  incarnation_.high = 0;
+  this->incarnation_.low = 0;
+  this->incarnation_.high = 0;
 
   // If a lock wasn't provided, let's assume the user doesn't want any
   // kind of lock at all.
@@ -45,7 +45,7 @@ incarnation (CORBA::Environment& _env)
 {
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber inc_num;
   TAO_READ_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, inc_num);
-  return incarnation_;
+  return this->incarnation_;
 }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index a0ca2b93f0a..910eb53ccd4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -20,7 +20,7 @@
 
 #include "Trader.h"
 
-class TAO_Service_Type_Repository :
+class TAO_ORBSVCS_Export TAO_Service_Type_Repository :
   public POA_CosTradingRepos::ServiceTypeRepository
   //
   // = TITLE
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 72acb2c9b48..297c84fc805 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -107,7 +107,7 @@ protected:
 
 // =  Classes to deal with the ACE_Hash_Map_Manager.
 
-class TAO_ORBSVCS_Export TAO_String_Hash_Key : public CORBA::String_var
+class TAO_String_Hash_Key : public CORBA::String_var
 {
   // = TITLE 
   //     Key for the Hash Table. The EXT_ID of the