summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Notify/lib
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/lib')
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Application_Command.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h10
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Consumer_T.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Filter_Command.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Peer_T.h6
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h4
-rw-r--r--TAO/orbsvcs/tests/Notify/lib/Supplier_T.h6
11 files changed, 0 insertions, 56 deletions
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index 1f7ecaefee3..527e2bc4844 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -45,10 +45,6 @@ public:
static const char* name ();
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 4cc0689e70c..559ed609abe 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
@@ -25,10 +25,6 @@ class TAO_Notify_Tests_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_Tests_Command_Factory_T : public TAO_Notify_Tests_Command_Factory, public ACE_Service_Object
{
@@ -47,13 +43,7 @@ public:
TAO_Notify_Tests_Command* create ();
};
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Command_Factory_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Command_Factory_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#include /**/ "ace/post.h"
#endif /* TAO_COMMAND_FACTORY_T_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index 7b9a8b7cf82..581379612e4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -45,10 +45,6 @@ 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/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index e9cedf5d4db..8ba7047f528 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -74,13 +74,7 @@ protected:
const CosNotification::EventTypeSeq & removed);
};
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Consumer_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Consumer_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#include /**/ "ace/post.h"
#endif /* TAO_Notify_Tests_CONSUMER_T_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index aa45aef7489..9900fe4772a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -49,10 +49,6 @@ 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 f679a6682b4..66bd77adb5d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -44,10 +44,6 @@ public:
static const char* name ();
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/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index 263b2df4803..af5ed4e01ad 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -103,13 +103,7 @@ protected:
typename Proxy_Traits::ID proxy_id_;
};
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Peer_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Peer_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#include /**/ "ace/post.h"
#endif /* TAO_Notify_Tests_PEER_T_H */
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index 12778f61a6e..cac534dd344 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -47,10 +47,6 @@ 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 e0d01d2559d..557188fd4d1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -46,10 +46,6 @@ public:
static const char* name ();
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 e7b13a30048..f95c319339c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -44,10 +44,6 @@ public:
static const char* name ();
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/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index 43d4e6310b2..cd580dab358 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -75,13 +75,7 @@ protected:
const CosNotification::EventTypeSeq & removed);
};
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
#include "Supplier_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Supplier_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#include /**/ "ace/post.h"
#endif /* TAO_Notify_Tests_SUPPLIER_T_H */