ChangeLogTag: Tue Mar 27 19:54:49 2001 Jeff Parsons <parsons@cs.wustl.edu>

25 files changed, 159 insertions, 9 deletions

diff --git a/TAO/examples/POA/Forwarding/MyFooServant.h b/TAO/examples/POA/Forwarding/MyFooServant.h
index c66c8da50be..2cb7f66d27a 100644
--- a/TAO/examples/POA/Forwarding/MyFooServant.h
+++ b/TAO/examples/POA/Forwarding/MyFooServant.h
@@ -18,6 +18,13 @@
 
 #include "FooS.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class MyFooServantActivator;
 
 class MyFooServant : public virtual PortableServer::RefCountServantBase,
@@ -50,4 +57,8 @@ protected:
   CORBA::Long value_;
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* MYFOOSERVANT_H */
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.dsp b/TAO/orbsvcs/examples/Notify/Filter/Filter.dsp
index 371fa0975fd..ee9034e4452 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.dsp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -99,6 +99,10 @@ SOURCE=.\main.cpp
 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Filter.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index ffc3b7c0adf..35fd599f4b5 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -20,6 +20,13 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class Filter_StructuredPushConsumer;
 class Filter_StructuredPushSupplier;
 
@@ -256,4 +263,9 @@ protected:
 };
 
 /*****************************************************************/
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_FILTER_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.dsp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.dsp
index d5f2fdb42bf..5d825801e3d 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.dsp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -99,6 +99,10 @@ SOURCE=.\Subscribe.cpp
 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Subscribe.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index 23dee4c7fc1..e2b1d0ad833 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -20,6 +20,13 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class Subscribe_StructuredPushConsumer;
 class Subscribe_StructuredPushSupplier;
 
@@ -242,4 +249,9 @@ protected:
 };
 
 /*****************************************************************/
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_SUBSCRIBE_CLIENT_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index f435ffdc9e2..e1b130cb3e2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -37,7 +37,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   while (frame != 0)
     {
       // Write the received data to the file.
-      int result =
+      size_t result =
         ACE_OS::fwrite (frame->rd_ptr (),
                         frame->length (),
                         1,
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 05a67a32134..3ac51cb26e9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -37,7 +37,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   while (frame != 0)
     {
       // Write the received data to the file.
-      int result =
+      size_t result =
         ACE_OS::fwrite (frame->rd_ptr (),
                         frame->length (),
                         1,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index aad091ad9c4..724476074b1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -40,7 +40,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   while (frame != 0)
     {
       // Write the received data to the file.
-      int result =
+      size_t result =
         ACE_OS::fwrite (frame->rd_ptr (),
                         frame->length (),
                         1,
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index aad091ad9c4..724476074b1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -40,7 +40,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   while (frame != 0)
     {
       // Write the received data to the file.
-      int result =
+      size_t result =
         ACE_OS::fwrite (frame->rd_ptr (),
                         frame->length (),
                         1,
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
index 9044d2dc367..665dc2511bb 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "child.h"
+#include "tao/ORB_Core.h"
 
 ACE_RCSID(benchmark, child, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
index d7aaa7497f4..48c276ccff5 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
@@ -2,8 +2,7 @@
 
 #include "client.h"
 #include "tao/debug.h"
-
-
+#include "tao/ORB_Core.h"
 
 ACE_RCSID(benchmark, client, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
index 02d6d093402..71095dd35ef 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.h
@@ -20,6 +20,13 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 /// Latency Consumer
 /**
  * Simple example of a consumer that registers for supplier
@@ -285,4 +292,8 @@ const char* Latency_Supplier::entry_point (void) const
   return entry_point_.fast_rep ();
 }
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* EVENT_LATENCY_H */
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.dsp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.dsp
index a19d0986ec6..0abe1ca14c9 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.dsp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.dsp
@@ -96,6 +96,10 @@ SOURCE=.\ConnectDisconnect.cpp
 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\ConnectDisconnect.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index 95ce40ccad6..8abb0fca5f7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -24,6 +24,13 @@
 #include "Notify_SequencePushConsumer.h"
 #include "Notify_SequencePushSupplier.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class ConnectDisconnect;
 
 class CD_Entity
@@ -120,4 +127,9 @@ protected:
 };
 
 /***************************************************************************/
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_TESTS_UPDATES_H */
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.dsp b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.dsp
index c1dd6acc301..fefde64d82b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.dsp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.dsp
@@ -96,6 +96,10 @@ SOURCE=.\Events_Test.cpp
 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Events_Test.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h
index cf91edeef0d..414553d430f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.h
@@ -21,6 +21,13 @@
 #include "Notify_StructuredPushConsumer.h"
 #include "Notify_StructuredPushSupplier.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class Events_Test;
 
 class Event_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
@@ -115,4 +122,9 @@ private:
 };
 
 /***************************************************************************/
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_TESTS_EventS_H */
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.dsp b/TAO/orbsvcs/tests/Notify/Basic/Simple.dsp
index 2ec52c06049..8ff08049571 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.dsp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.dsp
@@ -96,6 +96,10 @@ SOURCE=.\Simple.cpp
 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Simple.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index 3d258388d03..403755e4367 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -20,6 +20,13 @@
 #include "Notify_PushConsumer.h"
 #include "Notify_PushSupplier.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class Simple_Test;
 
 /***************************************************************************/
@@ -116,4 +123,9 @@ private:
 };
 
 /***************************************************************************/
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_TESTS_SIMPLE_H */
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.dsp b/TAO/orbsvcs/tests/Notify/Basic/Updates.dsp
index 6ef9418d2c5..8e0a4956754 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.dsp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.dsp
@@ -95,6 +95,10 @@ SOURCE=.\Updates.cpp
 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Updates.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index cd65174f53f..501fad463f0 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -21,6 +21,13 @@
 #include "Notify_StructuredPushConsumer.h"
 #include "Notify_StructuredPushSupplier.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class Updates;
 
 class Update_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
@@ -133,4 +140,9 @@ private:
 };
 
 /***************************************************************************/
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_TESTS_UPDATES_H */
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp
index 902074d82ce..3f3163089ec 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp
@@ -101,6 +101,10 @@ SOURCE=.\RedGreen_Test.cpp
 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\RedGreen_Test.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 42a8399f498..1be06a52b22 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -25,10 +25,16 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Sched_Params.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class RedGreen_Test_StructuredPushConsumer;
 class RedGreen_Test_StructuredPushSupplier;
 
-
 class Worker : public ACE_Task_Base
 {
   // = TITLE
@@ -321,4 +327,9 @@ protected:
 };
 
 /*****************************************************************/
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_RedGreen_Test_CLIENT_H */
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp
index 40502533b89..bf7cdf5e518 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp
@@ -95,6 +95,10 @@ SOURCE=.\Throughput.cpp
 # Begin Group "Header Files"

 

 # PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Throughput.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 1c44e247dfc..16b67a6c4d7 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -23,6 +23,13 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Sched_Params.h"
 
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
 class Worker : public ACE_Task_Base
 {
   // = TITLE
@@ -198,4 +205,9 @@ private:
 };
 
 /***************************************************************************/
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #endif /* NOTIFY_TESTS_EventS_H */
diff --git a/TAO/utils/NamingViewer/ViewIORDialog.cpp b/TAO/utils/NamingViewer/ViewIORDialog.cpp
index 174cff10468..df11edb4487 100644
--- a/TAO/utils/NamingViewer/ViewIORDialog.cpp
+++ b/TAO/utils/NamingViewer/ViewIORDialog.cpp
@@ -6,6 +6,7 @@
 #include "NamingViewer.h"
 #include "ViewIORDialog.h"
 #include "tao/IIOP_Profile.h"
+#include "tao/Stub.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW