ChangeLogTag: Mon Jul 4 08:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 16 insertions, 48 deletions

diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index 55f40c081d5..e7f9cd236a4 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -21,11 +21,6 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/SString.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 class Filter_StructuredPushConsumer;
 class Filter_StructuredPushSupplier;
 
@@ -130,7 +125,8 @@ class FilterClient
 };
 
 /*****************************************************************/
-class Filter_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase
+class Filter_StructuredPushConsumer
+  : public POA_CosNotifyComm::StructuredPushConsumer
 {
   // = TITLE
   //   Filter_StructuredPushConsumer
@@ -201,7 +197,8 @@ protected:
 
 /*****************************************************************/
 
-class Filter_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase
+class Filter_StructuredPushSupplier
+  : public POA_CosNotifyComm::StructuredPushSupplier
 {
   // = TITLE
   //   Filter_StructuredPushSupplier
@@ -261,10 +258,4 @@ protected:
       ));
 };
 
-/*****************************************************************/
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #endif /* NOTIFY_FILTER_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index bc7a3316a5c..0f3c3d76dd9 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -27,7 +27,8 @@
  *
  */
 
-class TAO_Notify_Lanes_Consumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase
+class TAO_Notify_Lanes_Consumer
+  : public POA_CosNotifyComm::StructuredPushConsumer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
index 45cb5a52007..db4a8f816cd 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier.h
@@ -20,18 +20,14 @@
 #include "ace/SString.h"
 #include "ace/Condition_Thread_Mutex.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 /**
  * @class TAO_Notify_Lanes_Supplier
  *
  * @brief Implement a Structured Supplier.
  *
  */
-class TAO_Notify_Lanes_Supplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase
+class TAO_Notify_Lanes_Supplier
+  : public POA_CosNotifyComm::StructuredPushSupplier
 {
  public:
   // = Initialization and Termination code
@@ -110,9 +106,5 @@ protected:
   int consumer_count_;
 };
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_SUPPLIER_H */
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index c9a3d7ad72f..126b842a4ca 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -20,11 +20,6 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 class Subscribe_StructuredPushConsumer;
 class Subscribe_StructuredPushSupplier;
 
@@ -119,7 +114,8 @@ class Subscribe
 };
 
 /*****************************************************************/
-class Subscribe_StructuredPushConsumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase
+class Subscribe_StructuredPushConsumer
+  : public POA_CosNotifyComm::StructuredPushConsumer
 {
   // = TITLE
   //   Subscribe_StructuredPushConsumer
@@ -189,7 +185,8 @@ protected:
 
 /*****************************************************************/
 
-class Subscribe_StructuredPushSupplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase
+class Subscribe_StructuredPushSupplier
+  : public POA_CosNotifyComm::StructuredPushSupplier
 {
   // = TITLE
   //   Subscribe_StructuredPushSupplier
@@ -246,10 +243,4 @@ protected:
       ));
 };
 
-/*****************************************************************/
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #endif /* NOTIFY_SUBSCRIBE_CLIENT_H */
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
index ffe7ad82f73..0af5b74d5fa 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
@@ -28,7 +28,8 @@
  *
  */
 
-class TAO_Notify_ThreadPool_Consumer : public POA_CosNotifyComm::StructuredPushConsumer, public PortableServer::RefCountServantBase
+class TAO_Notify_ThreadPool_Consumer
+  : public POA_CosNotifyComm::StructuredPushConsumer
 {
 public:
   /// Constuctor
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
index 7009f4ac045..e5238d0af7e 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.h
@@ -19,11 +19,6 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "ace/Condition_Thread_Mutex.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 #define TEST_MAX_CONSUMERS 10
 
 /**
@@ -32,7 +27,8 @@
  * @brief Implement a Structured Supplier.
  *
  */
-class TAO_Notify_ThreadPool_Supplier : public POA_CosNotifyComm::StructuredPushSupplier, public PortableServer::RefCountServantBase
+class TAO_Notify_ThreadPool_Supplier
+  : public POA_CosNotifyComm::StructuredPushSupplier
 {
 public:
   // = Initialization and Termination code
@@ -121,9 +117,5 @@ protected:
   CosNotification::StructuredEvent event_[TEST_MAX_CONSUMERS];
 };
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #include /**/ "ace/post.h"
 #endif /* TAO_Notify_SUPPLIER_H */