ChangeLogTag:Tue Nov 9 14:34:17 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

54 files changed, 201 insertions, 50 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index f0cb44b52ff..1bba4bdb8fe 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,5 +1,75 @@
-Tue Nov 09 10:25:41 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
+Tue Nov  9 14:34:17 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+       * TAO_IDL/be_include/be.h
+         orbsvcs/orbsvcs/Log/BasicLog_i.h
+	 orbsvcs/orbsvcs/Log/Iterator_i.h
+	 orbsvcs/orbsvcs/Event/Event_Channel.h
+	 orbsvcs/orbsvcs/Trader/Trader.h
+	 orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+	 orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
+	 orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
+	 orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
+	 orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
+	 orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
+	 orbsvcs/orbsvcs/CosEvent_Utilities.h
+	 orbsvcs/CosEvent_Service/CosEvent_Service.h
+	 tao/IOPC.h
+	 tao/CurrentC.h
+	 tao/DomainC.h
+	 tao/DomainS_T.h
+	 tao/DynAnyC.h
+	 tao/InterceptorC.h
+	 tao/InconsistentTypeCodeC.h
+	 tao/MessagingC.h
+	 tao/MessagingS.h
+	 tao/MessagingS_T.h
+	 tao/Messaging_Policy_i.h
+	 tao/POAC.h
+	 tao/ObjectIDList.h
+	 tao/POAS.h
+	 tao/POA_CORBA.h
+	 tao/PollableC.h
+	 tao/PollableS.h
+	 tao/PollableS_T.h
+	 tao/Services.h
+	 tao/IOPS.h
+	 tao/IORC.h
+	 tao/TimeBaseC.h
+	 tao/TimeBaseS_T.h
+	 tao/IORS.h
+	 tao/WrongTransactionC.h
+	 tao/corbafwd.h
+	 tao/CONV_FRAMEC.h
+	 tao/CONV_FRAMES.h
+	 tao/CONV_FRAMES_T.h
+	 tao/IOPS_T.h
+	 tao/InterfaceC.h
+	 tao/BoundsC.h
+	 tao/InterceptorS.h
+	 tao/TAOC.h
+	 tao/Client_Priority_Policy.h
+	 tao/TAOS.h
+	 tao/TAOS_T.h
+	 tao/Buffering_Constraint_Policy.h
+	 examples/OBV/Typed_Events/Event_Types_impl.h: Added
+	 
+	 #if defined(_MSC_VER)
+	 #pragma warning(push)
+	 #pragma warning(disable:4250)
+	 #endif /* _MSC_VER */
+  
+	 // ...
+  
+         #if defined(_MSC_VER)  
+	 #pragma warning(pop)
+	 #endif /* _MSC_VER */
+  
+         to these above files to that things will work better with MSVC++.
+	 Thanks to David Hauck <davidh@realtimeint.com> for
+	 suggesting this.
 
+Tue Nov 09 10:25:41 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
+    
 	* tao/GIOP_Server_Request.h: Added #include "tao/ORB.h".  I use ORB
 	  function in the .i file.  Thanks to David for noticing this.
 
diff --git a/TAO/TAO_IDL/be_include/be.h b/TAO/TAO_IDL/be_include/be.h
index b35ca4f68ba..0963f0f80fc 100644
--- a/TAO/TAO_IDL/be_include/be.h
+++ b/TAO/TAO_IDL/be_include/be.h
@@ -71,7 +71,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 //
 
 #if defined (ACE_WIN32)
-#pragma    warning(disable:4250)
+#pragma warning(push)
+#pragma warning(disable:4250)
 #endif /* ACE_WIN32 */
 
 // ACE includes
@@ -134,4 +135,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include        "be_interface_strategy.h" // strategy for interface nodes
 
-#endif           // _BE_BE_HH
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#endif           /* _BE_BE_HH */
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 4ebba4e9281..513417455e8 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -517,7 +517,7 @@ also receives other options that are specific to it. <P>
 
     <td>If the value of the flag is 0, tao_idl will generate code that
         will use native C++ exceptions. If the value of the flag is 1,
-        tao_idl will generate code that will use environment variable for
+        tao_idl will generate code that will use the <CODE>CORBA::Environment</CODE> variable for
         passing exceptions </td>
     <td>&nbsp;</td>
   </tr>
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
index 13f283e11d0..b6cad373a1d 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
@@ -37,6 +37,7 @@
 // reference counting.
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -421,6 +422,6 @@ class Criterion_List_Iterator
 #define JONAS 1
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 #endif /* EVENT_TYPES_IMPL_H */
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
index 44a16f886b4..bd7f3b5c0e0 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
@@ -20,6 +20,7 @@
 #include "orbsvcs/CosNamingC.h"
 
 #if defined (_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -100,7 +101,7 @@ protected:
 };
 
 #if defined (_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* COSEVENT_SERVICE_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
index a0556682983..a7626a5ed5c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
@@ -26,6 +26,7 @@
 #include "orbsvcs/CosEvent/ProxyPushSupplier_i.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,7 +71,7 @@ private:
 };
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* CONSUMERADMIN_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
index 8136df9e229..8aaae9ba355 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
@@ -27,6 +27,7 @@
 #include "orbsvcs/CosEvent/SupplierAdmin_i.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -93,7 +94,7 @@ private:
 };
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* EVENTCHANNEL_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
index 89ab9b8d6bf..9b9c34f49af 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
@@ -25,6 +25,7 @@
 #include "orbsvcs/CosEventChannelAdminS.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -87,7 +88,7 @@ private:
 };
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* _PROXYPUSHCONSUMER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
index 40e2c2fbfe5..1eda0bdc92b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
@@ -25,6 +25,7 @@
 #include "orbsvcs/CosEventChannelAdminC.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -76,7 +77,7 @@ private:
 };
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* _PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
index 27495df1860..c784d17fcf3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
@@ -26,6 +26,7 @@
 #include "orbsvcs/CosEvent/ProxyPushConsumer_i.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -72,7 +73,7 @@ private:
 };
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* SUPPLIER_ADMIN_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
index ab6b716bba3..ed4b651828d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
@@ -26,6 +26,7 @@
 #include "orbsvcs/Event_Utilities.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -158,7 +159,7 @@ class TAO_ORBSVCS_Export CosEC_ServantBase :
 
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_COSEVENT_UTILITIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 052c819cea8..2489e6e23e8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -101,6 +101,7 @@ void TAO_ORBSVCS_Export dump_event (const RtecEventComm::Event &event);
 
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -1427,7 +1428,7 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ACE_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index 11dbe938c24..b10dabcbf8b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -27,6 +27,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -63,4 +64,9 @@ public:
   LogMgr_i &logmgr_i_;
   // Used to access the hash map that holds all the Logs created.
 };
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TLS_BASICLOG_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
index bee71d7827f..9ad65bcf3b6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.h
@@ -28,6 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -77,4 +78,8 @@ private:
   // Max rec list length.
 };
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TLS_ITERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index a9fa6b518ed..2a153edd81d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -21,6 +21,7 @@
 #include "tao/corba.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
@@ -320,4 +321,8 @@ class TAO_Literal_Constraint : public TAO_Constraint
 
 };
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TAO_CONSTRAINT_NODES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index 29af7816659..755a556ba6e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -43,6 +43,7 @@
 #include "orbsvcs/orbsvcs_export.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
@@ -478,4 +479,8 @@ operator< (const CosTradingRepos::ServiceTypeRepository::IncarnationNumber &l,
 int operator== (const CosTrading::Admin::OctetSeq& left,
                 const CosTrading::Admin::OctetSeq& right);
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TAO_TRADER_BASE_H */
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
index b13ef2062a4..0aaeb7a9b15 100644
--- a/TAO/tao/BoundsC.h
+++ b/TAO/tao/BoundsC.h
@@ -28,6 +28,7 @@
 #  define TAO_EXPORT_NESTED_MACRO
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -74,7 +75,7 @@ CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA::Bounds &);
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
index baabc26dfa1..4d7734d69cc 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.h
@@ -31,6 +31,7 @@
 #include "tao/TAOS.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -82,7 +83,7 @@ private:
 };
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 0c94e90fb07..0ba125bca00 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -32,6 +32,7 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -362,7 +363,7 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_CONV_FRAMEC_H */
diff --git a/TAO/tao/CONV_FRAMES.h b/TAO/tao/CONV_FRAMES.h
index 2a84fb56ed5..3bf3c6e9480 100644
--- a/TAO/tao/CONV_FRAMES.h
+++ b/TAO/tao/CONV_FRAMES.h
@@ -27,6 +27,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -42,7 +43,7 @@ TAO_NAMESPACE_CLOSE
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_CONV_FRAMES_H */
diff --git a/TAO/tao/CONV_FRAMES_T.h b/TAO/tao/CONV_FRAMES_T.h
index ef1f07d9e0b..dc201a3a1c6 100644
--- a/TAO/tao/CONV_FRAMES_T.h
+++ b/TAO/tao/CONV_FRAMES_T.h
@@ -21,6 +21,7 @@
 #define TAO_CONV_FRAMES_T_H
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -40,7 +41,7 @@
 #endif /* defined REQUIRED PRAGMA */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_CONV_FRAMES_T_H */
diff --git a/TAO/tao/Client_Priority_Policy.h b/TAO/tao/Client_Priority_Policy.h
index f7696537cca..230e70d56b3 100644
--- a/TAO/tao/Client_Priority_Policy.h
+++ b/TAO/tao/Client_Priority_Policy.h
@@ -33,6 +33,7 @@
 #include "tao/TAOS.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -91,7 +92,7 @@ private:
 };
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index f8254e7fd60..24c22b9a46d 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -37,6 +37,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -152,7 +153,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Current *&);
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_IDL_CURRENTC_H */
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index a627cf9fd23..631c9b0b288 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -25,6 +25,7 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -330,4 +331,8 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &,
 #include "tao/DomainC.i"
 #endif /* defined INLINE */
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TAO_IDL_DOMAINC_H */
diff --git a/TAO/tao/DomainS_T.h b/TAO/tao/DomainS_T.h
index 64034da6ef3..1c5f4f1c8e5 100644
--- a/TAO/tao/DomainS_T.h
+++ b/TAO/tao/DomainS_T.h
@@ -12,6 +12,7 @@
 #define _TAO_IDL_DOMAINS_T_H_
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -31,7 +32,7 @@
 #endif /* defined REQUIRED PRAGMA */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index 575c3e77419..201ca0d3323 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -43,6 +43,7 @@
 #endif
 #define TAO_EXPORT_MACRO
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -1545,7 +1546,7 @@ extern  CORBA::TypeCode_ptr  _tc_CORBA_DynArray;
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 3d81a5d618f..3b4e8633647 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -34,6 +34,7 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -663,7 +664,7 @@ CORBA::Boolean TAO_Export operator>> (
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_IOPC_H */
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
index 18a13f21d11..118e42b2e6e 100644
--- a/TAO/tao/IOPS.h
+++ b/TAO/tao/IOPS.h
@@ -27,6 +27,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -42,7 +43,7 @@ TAO_NAMESPACE_CLOSE
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_IOPS_H */
diff --git a/TAO/tao/IOPS_T.h b/TAO/tao/IOPS_T.h
index 9d8f8562cd2..681384c987d 100644
--- a/TAO/tao/IOPS_T.h
+++ b/TAO/tao/IOPS_T.h
@@ -21,6 +21,7 @@
 #define TAO_IOPS_T_H
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -40,7 +41,7 @@
 #endif /* defined REQUIRED PRAGMA */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_IOPS_T_H */
diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h
index 0ace82810f7..893f04bec2a 100644
--- a/TAO/tao/IORC.h
+++ b/TAO/tao/IORC.h
@@ -29,6 +29,7 @@
 #endif
 #define TAO_EXPORT_MACRO
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -515,7 +516,7 @@ operator>> (
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/IORS.h b/TAO/tao/IORS.h
index fa05357b5ce..d3acf9b10cc 100644
--- a/TAO/tao/IORS.h
+++ b/TAO/tao/IORS.h
@@ -20,6 +20,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -207,7 +208,7 @@ TAO_NAMESPACE_CLOSE
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/InconsistentTypeCodeC.h b/TAO/tao/InconsistentTypeCodeC.h
index dcdcf0b9865..f6f54539cce 100644
--- a/TAO/tao/InconsistentTypeCodeC.h
+++ b/TAO/tao/InconsistentTypeCodeC.h
@@ -40,6 +40,7 @@
 #endif
 #define TAO_EXPORT_MACRO
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -77,7 +78,7 @@ public:
 #endif /* end #if !defined */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/InterceptorC.h b/TAO/tao/InterceptorC.h
index 8c93a30c55b..d52f334d711 100644
--- a/TAO/tao/InterceptorC.h
+++ b/TAO/tao/InterceptorC.h
@@ -29,6 +29,7 @@
 #  define TAO_EXPORT_NESTED_MACRO TAO_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -739,7 +740,7 @@ CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableInterceptor::
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/InterceptorS.h b/TAO/tao/InterceptorS.h
index e59d7db8941..3fc9ea36b42 100644
--- a/TAO/tao/InterceptorS.h
+++ b/TAO/tao/InterceptorS.h
@@ -18,6 +18,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -437,7 +438,7 @@ TAO_NAMESPACE_CLOSE
 #endif /* TAO_HAS_INTERCEPTORS */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h
index 7f78630aa24..093fd789d0e 100644
--- a/TAO/tao/InterfaceC.h
+++ b/TAO/tao/InterfaceC.h
@@ -35,6 +35,7 @@
 #  define TAO_EXPORT_NESTED_MACRO
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -8537,7 +8538,7 @@ operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /*TAO_HAS_INTERFACE_REPOSITORY */
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 020f51bf763..bccba0fbb0e 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -49,6 +49,7 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -2160,7 +2161,7 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::Poller_ptr &);
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h
index 7cb39762222..d959ecdd9b1 100644
--- a/TAO/tao/MessagingS.h
+++ b/TAO/tao/MessagingS.h
@@ -24,6 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -2044,7 +2045,7 @@ TAO_NAMESPACE_CLOSE
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/MessagingS_T.h b/TAO/tao/MessagingS_T.h
index 020b5cba536..c5af969fae1 100644
--- a/TAO/tao/MessagingS_T.h
+++ b/TAO/tao/MessagingS_T.h
@@ -12,6 +12,7 @@
 #define _TAO_IDL_MESSAGINGS_T_H_
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -31,7 +32,7 @@
 #endif /* defined REQUIRED PRAGMA */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h
index 632bf105071..9f5e7c6ce46 100644
--- a/TAO/tao/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging_Policy_i.h
@@ -27,6 +27,7 @@
 #include "tao/MessagingS.h"
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -142,7 +143,7 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h
index 010df446d42..07836fee86b 100644
--- a/TAO/tao/ObjectIDList.h
+++ b/TAO/tao/ObjectIDList.h
@@ -26,6 +26,7 @@
 #endif
 #define TAO_EXPORT_MACRO
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -136,7 +137,7 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_ORB_ObjectIdList &);
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index d38f42707ec..ec9d541cf0f 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -34,6 +34,7 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -2405,6 +2406,6 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::Current::N
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 #endif /* TAO_IDL_POAC_H */
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
index a932adf9f94..e535cbc7366 100644
--- a/TAO/tao/POAS.h
+++ b/TAO/tao/POAS.h
@@ -32,6 +32,7 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -1213,7 +1214,7 @@ TAO_NAMESPACE_CLOSE
 #endif // defined INLINE
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_IDL_POAS_H */
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index 46779bedc9c..bb5ce1bd920 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -44,6 +44,7 @@
 #endif /* TAO_HAS_AMI_POLLER */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -1792,13 +1793,13 @@ private:
 #endif /* ! defined TAO_HAS_MINIMUM_CORBA */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 };
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_IDL_POA_CORBA_H */
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index 9cf9f68fdf0..3b3c7584bde 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -38,6 +38,7 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -434,7 +435,7 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_PollableSet::Unknown
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_AMI_POLLER */
diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h
index d1a1ca80da8..59ea605041b 100644
--- a/TAO/tao/PollableS.h
+++ b/TAO/tao/PollableS.h
@@ -31,6 +31,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -230,7 +231,7 @@ TAO_NAMESPACE_CLOSE
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_AMI_POLLER */
diff --git a/TAO/tao/PollableS_T.h b/TAO/tao/PollableS_T.h
index 53df91ebb91..0bb857546c2 100644
--- a/TAO/tao/PollableS_T.h
+++ b/TAO/tao/PollableS_T.h
@@ -12,6 +12,7 @@
 #define _TAO_IDL_POLLABLES_T_H_
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -31,7 +32,7 @@
 #endif /* defined REQUIRED PRAGMA */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/Services.h b/TAO/tao/Services.h
index 5dd5a25cc91..7b4efa4dcd6 100644
--- a/TAO/tao/Services.h
+++ b/TAO/tao/Services.h
@@ -25,6 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -539,7 +540,7 @@ CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation::_tao_seq_S
 
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_SERVICES_H */
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index e2840a6e1f3..3fdd25b2f40 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -39,6 +39,7 @@
 #  define TAO_EXPORT_NESTED_MACRO TAO_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -438,7 +439,7 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, TAO::BufferingConstraint &
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/TAOS.h b/TAO/tao/TAOS.h
index b84ce05c381..b66a7b5a555 100644
--- a/TAO/tao/TAOS.h
+++ b/TAO/tao/TAOS.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -189,7 +190,7 @@ TAO_NAMESPACE_CLOSE
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/TAOS_T.h b/TAO/tao/TAOS_T.h
index 14c9a93681d..8bde1d97730 100644
--- a/TAO/tao/TAOS_T.h
+++ b/TAO/tao/TAOS_T.h
@@ -11,6 +11,7 @@
 #define _TAO_IDL__PROJECT_DOC_MARINA_ACE_WRAPPERS_TAO_TAO_TAOS_T_H_
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -30,7 +31,7 @@
 #endif /* defined REQUIRED PRAGMA */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* ifndef */
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index 47740f3b586..54daff12ec0 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -34,6 +34,7 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -148,7 +149,7 @@ CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_IDL_TIMEBASEC_H */
diff --git a/TAO/tao/TimeBaseS_T.h b/TAO/tao/TimeBaseS_T.h
index 63619c9a443..966b5a574bb 100644
--- a/TAO/tao/TimeBaseS_T.h
+++ b/TAO/tao/TimeBaseS_T.h
@@ -19,6 +19,7 @@
 #define TAO_IDL_TIMEBASES_T_H
 
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -38,7 +39,7 @@
 #endif /* defined REQUIRED PRAGMA */
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_IDL_TIMEBASES_T_H */
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 580b5885ff0..b297877b6f2 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -38,6 +38,7 @@
 #endif
 #define TAO_EXPORT_MACRO
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -69,7 +70,7 @@ public:
 }; // exception CORBA::WrongTransaction
 
 #if defined(_MSC_VER)
-#pragma warning(default:4250)
+#pragma warning(pop)
 #endif /* _MSC_VER */
 
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index e5e48be282f..a089ef20d9c 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -76,6 +76,7 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 #if defined(_MSC_VER)
+#pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -1817,4 +1818,8 @@ typedef TAO_ObjectKey *TAO_ObjectKey_ptr;
 # include "tao/corbafwd.i"
 #endif /* ! __ACE_INLINE__ */
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* TAO_CORBAFWD_H */