ChangeLogTag: Mon Jun 23 13:03:56 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>

8 files changed, 51 insertions, 16 deletions

diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
index edf4970ade2..3a485e17f89 100644
--- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
+++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp
@@ -333,11 +333,15 @@ parse_args (int argc, ACE_TCHAR *argv[])
   return 0;
 }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   int status = 0;
   
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
@@ -412,8 +416,11 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       status++;
     }
 
+#else
+  ACE_UNUSED_ARG (argc);
+  ACE_UNUSED_ARG (argv);
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
   return status;
 }
 
-#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
-
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp
index 0420df15255..81ceb236370 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Control/Control.cpp
@@ -30,9 +30,13 @@ error (const char* msg)
   ACE_OS::exit (1);
 }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 int
 ACE_TMAIN (int, ACE_TCHAR*[])
 {
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
   try
     {
       ACE_CString name ("Control Test");
@@ -63,8 +67,8 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       error ("Caught an unexpected exception type");
     }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
   return 0;
 }
 
-#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
-
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
index 49272f21e3a..436a1356a56 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorControlExt/MonitorControlExt.cpp
@@ -25,9 +25,13 @@ error (const char* msg)
   ACE_OS::exit (1);
 }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
@@ -373,8 +377,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       error ("Caught an unexpected exception type");
     }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
   return 0;
 }
 
-#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
-
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp
index 88ba6704fe3..f67444b7b4d 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorClient.cpp
@@ -11,9 +11,13 @@ error (const char* msg)
   ACE_OS::exit (1);
 }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 int
 ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
   try
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
@@ -44,8 +48,8 @@ ACE_TMAIN (int argc, ACE_TCHAR* argv[])
       error ("Caught an unexpected exception type");
     }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
   return 0;
 }
 
-#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
-
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp
index 5424c7b5160..de59945a979 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/MonitorManager/MonitorManager.cpp
@@ -14,9 +14,13 @@ error (const char* msg)
   ACE_OS::exit (1);
 }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 int
 ACE_TMAIN (int, ACE_TCHAR* argv[])
 {
+#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
+
   try
     {
       if (ACE_Service_Config::open (argv[0]) != 0)
@@ -45,8 +49,8 @@ ACE_TMAIN (int, ACE_TCHAR* argv[])
       error ("Caught an unexpected exception type");
     }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
   return 0;
 }
 
-#endif /* ACE_HAS_MONITOR_FRAMEWORK==1 */
-
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
index 1b77af54f8d..46ef48cdd98 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/NotificationServiceMonitor/NotificationServiceMonitor.cpp
@@ -18,9 +18,13 @@ error (const char* msg)
   ACE_OS::exit (1);
 }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 int
 ACE_TMAIN (int, ACE_TCHAR*[])
 {
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
   try
     {
       TAO_Singleton_Manager::instance ()->init ();
@@ -160,8 +164,8 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       error ("Caught an unexpected exception type");
     }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
   return 0;
 }
 
-#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
-
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
index 637e7f1da81..7b5a4587e4c 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic/Statistic.cpp
@@ -14,9 +14,13 @@ error (const char* msg)
   ACE_OS::exit (1);
 }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 int
 ACE_TMAIN (int, ACE_TCHAR*[])
 {
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
   try
     {
       Monitor_Base counter ("counter", Monitor_Base::MC_COUNTER);
@@ -110,8 +114,8 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       error ("Caught an unexpected exception type");
     }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
   return 0;
 }
 
-#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
-
diff --git a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
index 2c277f46a0f..e65889a5e47 100644
--- a/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
+++ b/TAO/orbsvcs/tests/unit/Notify/MC/Statistic_Registry/Statistic_Registry.cpp
@@ -16,9 +16,13 @@ error (const char* msg)
   ACE_OS::exit (1);
 }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
 int
 ACE_TMAIN (int, ACE_TCHAR*[])
 {
+#if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1)
+
   try
     {
       TAO_Singleton_Manager::instance ()->init ();
@@ -94,8 +98,8 @@ ACE_TMAIN (int, ACE_TCHAR*[])
       error ("Caught an unexpected exception type");
     }
 
+#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
+
   return 0;
 }
 
-#endif /* TAO_HAS_MONITOR_FRAMEWORK==1 */
-