Thu Feb 2 16:31:15 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>

8 files changed, 22 insertions, 35 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index cf723880be8..c6e508ef7b9 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,19 @@
+Thu Feb  2 16:31:15 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/NodeManager/BaseMonitor.h
+        * DAnCE/NodeManager/CIAO_Monitor.h
+        * DAnCE/NodeManager/MonitorCB.h
+        * DAnCE/NodeManager/MonitorController.cpp
+        * DAnCE/NodeManager/MonitorController.h
+        * DAnCE/TargetManager/DomainDataManager.h
+        
+          Removed extra ';' after closing braces on namespaces.
+          Was causing errors on GCC4 builds. 
+        
+        * DAnCE/NodeManager/MonitorController.inl
+        
+          Removed this file, as it is no longer used.
+
 Wed Feb  1 21:21:35 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/NodeManager/BaseMonitor.h
diff --git a/TAO/CIAO/DAnCE/NodeManager/BaseMonitor.h b/TAO/CIAO/DAnCE/NodeManager/BaseMonitor.h
index 2282dd381d9..fc34383aa06 100644
--- a/TAO/CIAO/DAnCE/NodeManager/BaseMonitor.h
+++ b/TAO/CIAO/DAnCE/NodeManager/BaseMonitor.h
@@ -57,7 +57,7 @@ namespace CIAO
   extern "C" ACE_Proper_Export_Flag CIAO::MonitorBase *
     createMonitor (void);
 
-}; // CIAO
+} // CIAO
 
 
 #endif /* MONITOR_BASEH */
diff --git a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h b/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
index 66a075f9fa7..d6f15d06802 100644
--- a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
+++ b/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
@@ -102,5 +102,5 @@ namespace CIAO
     auto_ptr <Deployment::Domain> current_domain_;
   };
 
-}; // CIAO
+} // CIAO
 #endif /* CIAO_MONITORH */
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorCB.h b/TAO/CIAO/DAnCE/NodeManager/MonitorCB.h
index 7c94eab51fb..66cb25db287 100644
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorCB.h
+++ b/TAO/CIAO/DAnCE/NodeManager/MonitorCB.h
@@ -69,6 +69,6 @@ namespace CIAO
   /// The Callback function pointer
   typedef int (MonitorCB::*CallBack) (::Deployment::Domain &);
 
-}; // CIAO namespace
+} // CIAO namespace
 
 #endif /* MONITOR_CBH */
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp b/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp
index 59727210f16..fc009f1b3fe 100644
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp
@@ -32,7 +32,7 @@ namespace CIAO
   const int interval = 10;
 
   static const char* factory_func = "createMonitor";
-};
+}
 
 CIAO::MonitorController::MonitorController (CORBA::ORB_ptr orb,
                                             ::Deployment::Domain& domain,
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorController.h b/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
index bc3d5a11a3c..4129a9b365b 100644
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
+++ b/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
@@ -105,6 +105,6 @@ namespace CIAO
       ::Deployment::Domain initial_domain_;
     };
 
-}; // CIAO
+} // CIAO
   
 #endif
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorController.inl b/TAO/CIAO/DAnCE/NodeManager/MonitorController.inl
deleted file mode 100644
index b1dbdcc7bbb..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorController.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-#ifndef MONITOR_CONTROLLER_INL
-#define MONITOR_CONTROLLER_INL
-
-ACE_INLINE
-void MonitorController::terminate ()
-{
-  // make the terminate flag false
-  ACE_GUARD (ACE_SYNCH_MUTEX,
-             guard,
-             lock_
-             );
-  ACE_DEBUG ((LM_DEBUG , "WITHIN TERMINATE CALL  ......"));
-  terminate_flag_=1;
-}
-
-ACE_INLINE
-bool MonitorController::terminating ()
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
-                    guard,
-                    lock_,
-                    0
-                    );
-  return terminate_flag_;
-}
-
-#endif
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
index 2a54c217f9f..6d3e8772c87 100644
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -113,6 +113,6 @@ namespace CIAO
       ::Deployment::TargetManager_var target_mgr_;
     };
 
-}; // CIAO
+} // CIAO
 
 #endif /* DOMAIN_DATA_MGRH */