Removed symbol clash on HPUX

9 files changed, 46 insertions, 1 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8e3fbcf5c6f..821cbcfe8da 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Fri Apr 11 09:33:41 2003  Dave Smith  <dts@prismtechnologies.com>
+
+	* orbsvcs/test/Notify/lib/Application_Commnad.h
+	* orbsvcs/test/Notify/lib/Command_Factory_T.h
+	* orbsvcs/test/Notify/lib/ConsumerAdmin_Command.h
+	* orbsvcs/test/Notify/lib/EventChannel_Command.h
+	* orbsvcs/test/Notify/lib/Filter_Command.h
+	* orbsvcs/test/Notify/lib/Periodic_Consumer_Command.h
+	* orbsvcs/test/Notify/lib/Periodic_Supplier_Command.h
+	* orbsvcs/test/Notify/lib/SupplierAdmin_Command.h
+	  Removed clash with symbol defined in
+	  /usr/include/machine/cpu.h on HPUX.
+
+
 Thu Apr 10 07:06:07 2003 Pradeep Gore <pradeep@oomworks.com>
 
 	* orbsvcs/tests/Notify/RT_lib/Makefile:
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index d2edbe5ce07..bb52e3ffc7b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -50,6 +50,10 @@ public:
   static const char* name (void);
 
 protected:
+#ifdef HPUX_11
+   // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
+#undef COMMAND
+#endif
   enum COMMAND
   {
     INIT,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
index e879ed7078a..7d46a55bf5e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
@@ -31,6 +31,10 @@ class TAO_NS_Command;
  * @brief Template class to create COMMAND specific factories.
  *
  */
+#ifdef HPUX_11
+   // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
+#undef COMMAND
+#endif
 template <class COMMAND>
 class TAO_NOTIFY_TEST_Export TAO_NS_Command_Factory_T : public TAO_NS_Command_Factory, public ACE_Service_Object
 {
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index 1a75c5a369b..bf6162d47ae 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -51,6 +51,10 @@ public:
 protected:
 
   /// = Data Members
+#ifdef HPUX_11
+   // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
+#undef COMMAND
+#endif
   enum COMMAND
   {
     CREATE,
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index 8fd304c7fe1..7a9472a3ec1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -50,7 +50,10 @@ public:
 
 protected:
   ///= Data Members
-
+#ifdef HPUX_11
+   // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
+#undef COMMAND
+#endif
   enum COMMAND
   {
     CREATE,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 5c561bf7e01..243b34728da 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -50,6 +50,10 @@ public:
 
 protected:
 
+#ifdef HPUX_11
+   // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
+#undef COMMAND
+#endif
   enum COMMAND
   {
     CREATE_FACTORY,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index 348fa69b0c4..71e093c0b65 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -51,6 +51,10 @@ public:
 
 protected:
   ///= Data Members
+#ifdef HPUX_11
+   // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
+#undef COMMAND
+#endif
   enum COMMAND
   {
     CREATE,
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 4d6c87a01f3..f9c9bfc941f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -52,6 +52,10 @@ public:
 
 protected:
 
+#ifdef HPUX_11
+   // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
+#undef COMMAND
+#endif
   enum COMMAND
   {
     CREATE,
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index 7318f212f55..a8e0dfa8da8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -50,6 +50,10 @@ public:
 
 protected:
 
+#ifdef HPUX_11
+   // Remove clash with /usr/include/machine/cpu.h and /usr/include/pa/cpu.h
+#undef COMMAND
+#endif
   enum COMMAND
   {
     CREATE,