ChangeLogTag:Tue Nov 29 06:44:35 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

28 files changed, 129 insertions, 93 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5f7762a58da..543d9547d49 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,35 @@
+Tue Nov 29 06:44:35 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h:
+	* orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
+	* orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h:
+	* orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp:
+	* orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h:
+	* orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp:
+	* orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h:
+	* orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp:
+	* orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h:
+	* orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp:
+	* orbsvcs/FT_ReplicationManager/FT_Property_Validator.h:
+	* orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp:
+	* orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h:
+	* orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp:
+	* orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h:
+	* orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp:
+	* orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h:
+	* orbsvcs/Fault_Detector/Fault_Detector_i.cpp:
+	* orbsvcs/Fault_Detector/Fault_Detector_i.h:
+	* orbsvcs/Fault_Notifier/FT_Notifier_i.cpp:
+	* orbsvcs/Fault_Notifier/FT_Notifier_i.h:
+	* orbsvcs/ImplRepo_Service/ImR_Locator_i.h:
+	* orbsvcs/Notify_Service/Notify_Service.h:
+	* orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h:
+	* orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
+	* orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
+	* orbsvcs/orbsvcs/Notify/Notify_Extensions.h:
+
+	  More versioned namespace build fixes.
+
 Tue Nov 29 13:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/LRU_Connection_Purging_Strategy.cpp:
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
index 64fd3722ff6..9238edf51b0 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
@@ -18,10 +18,12 @@
 #include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
 #include "TP_Task.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace POA_RtecScheduler
 {
     class Scheduler;
 }
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 class FT_EventService : private TAO_FTEC_Become_Primary_Listener
 {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index ba03306ae7d..03fc838db47 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
@@ -24,6 +24,9 @@ ACE_RCSID (FT_DefaultFaultAnalyzer,
            FT_DefaultFaultAnalyzer,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Default constructor.
 TAO::FT_DefaultFaultAnalyzer::FT_DefaultFaultAnalyzer ()
 {
@@ -167,3 +170,5 @@ int TAO::FT_DefaultFaultAnalyzer::analyze_fault_event (
   // no-op
   return 0;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
index e5b1b0b8292..0901c34e63b 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
@@ -28,6 +28,8 @@
 #include "FT_ReplicationManagerLib_export.h"
 #include "FT_FaultAnalyzer.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -80,6 +82,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_DEFAULT_FAULT_ANALYZER_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
index 97f0af6e56c..bd2d2d8d059 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
@@ -17,6 +17,8 @@ ACE_RCSID (FT_FaultAnalyzer,
            FT_FaultAnalyzer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Default constructor.
 TAO::FT_FaultAnalyzer::FT_FaultAnalyzer ()
 {
@@ -27,3 +29,4 @@ TAO::FT_FaultAnalyzer::~FT_FaultAnalyzer ()
 {
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
index 814162e6662..253421fe577 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
@@ -25,6 +25,8 @@
 #include "FT_ReplicationManagerLib_export.h"
 #include "orbsvcs/CosNotifyCommC.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -79,6 +81,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_FAULT_ANALYZER_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index 41aa53029ed..5a08f15d6d9 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -25,6 +25,9 @@ ACE_RCSID (FT_FaultConsumer,
            FT_FaultConsumer,
            "$Id$")
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Default constructor.
 TAO::FT_FaultConsumer::FT_FaultConsumer ()
   : poa_ (PortableServer::POA::_nil ())
@@ -297,3 +300,4 @@ void TAO::FT_FaultConsumer::disconnect_structured_push_consumer (
     ));
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index a8d0b7f1477..4ba96cdee31 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -26,6 +26,8 @@
 #include "orbsvcs/FT_NotifierC.h"
 #include "FT_ReplicationManagerLib_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
 
@@ -160,6 +162,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_FAULT_CONSUMER_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
index b285d43d71f..3f101f27dea 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
@@ -23,6 +23,8 @@ ACE_RCSID (FT_FaultEventDescriptor,
            FT_FaultEventDescriptor,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Default constructor.
 TAO::FT_FaultEventDescriptor::FT_FaultEventDescriptor ()
   : all_at_location_failed (0)
@@ -90,3 +92,5 @@ void TAO::FT_FaultEventDescriptor::dump ()
     ));
   }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index d0b64b49e4f..fe174448fb2 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
@@ -26,6 +26,8 @@
 #include "orbsvcs/PortableGroupC.h"
 #include "FT_ReplicationManagerLib_export.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /// Helper class for describing the properties in a fault event.
@@ -70,6 +72,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_FAULT_EVENT_DESCRIPTOR_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
index 205f9f96d63..0268c527fbb 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -8,6 +8,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::FT_Property_Validator::FT_Property_Validator (void)
   : replication_style_ (1),
     membership_style_ (1),
@@ -240,3 +242,5 @@ TAO::FT_Property_Validator::validate_criteria (
       ACE_THROW (PortableGroup::InvalidCriteria (invalid_criteria));
     }
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
index cc5912f9b36..954d7f29ded 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -22,6 +22,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO
 {
   /**
@@ -88,6 +90,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_PROPERTY_VALIDATOR_H */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index ee22bd331d4..736e6c440e9 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -69,6 +69,8 @@ ACE_RCSID (FT_ReplicationManager,
 #define TODO
 //#define TODO int todo; // warn on todos
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 TAO::FT_ReplicationManager::FT_ReplicationManager ()
   : orb_ (CORBA::ORB::_nil ())
   , poa_ (PortableServer::POA::_nil ())
@@ -1091,69 +1093,4 @@ int TAO::FT_ReplicationManager::write_ior ()
   return result;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
index 7914745a0e5..a38ed1ec911 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -34,6 +34,7 @@
 #include <orbsvcs/PortableGroup/PG_FactoryRegistry.h>
 #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -519,6 +520,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_REPLICATION_MANAGER_H_ */
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
index a42fc47a2ba..4606008727c 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -26,6 +26,8 @@ ACE_RCSID (FT_ReplicationManagerFaultAnalyzer,
            FT_ReplicationManagerFaultAnalyzer,
            "$Id$")
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /// Constructor.
 TAO::FT_ReplicationManagerFaultAnalyzer::FT_ReplicationManagerFaultAnalyzer (
   const TAO::FT_ReplicationManager * replication_manager)
@@ -1112,3 +1114,5 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::type_failure (
 
   return result;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
index f15238af5bf..6b2e263ee85 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
@@ -27,8 +27,12 @@
 #include "orbsvcs/FT_CORBAC.h"
 
 // Forward declarations.
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 template <class T> class ACE_Unbounded_Set;
 template <class T> class ACE_Unbounded_Set_Iterator;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -188,6 +192,8 @@ namespace TAO
 
 } // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif  /* FT_REPLICATION_MANAGER_FAULT_ANALYZER_H_ */
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
index 7e8b4f8c457..95326565432 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -42,6 +42,8 @@
     return /* value goes here */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 //////////////////////////////////////////////////////
 // FT_FaultDetectorFactory_i  Construction/destruction
 
@@ -708,3 +710,4 @@ CORBA::Boolean TAO::FT_FaultDetectorFactory_i::is_alive (ACE_ENV_SINGLE_ARG_DECL
     1;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
index 7333ffb7a87..a28eebffe56 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -23,13 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-//////////////////////////////////
-// Classes declared in this header
-namespace TAO
-{
-  class  FT_FaultDetectorFactory_i;
-}
-
 /////////////////////////////////
 // Includes needed by this header
 #include <ace/Vector_T.h>
@@ -37,6 +30,9 @@ namespace TAO
 #include <orbsvcs/FT_ReplicationManagerC.h>
 #include <ace/Thread_Manager.h>
 
+
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 /////////////////////
 // Forward references
 
@@ -344,5 +340,7 @@ namespace TAO
   };
 }   // namespace TAO
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* FT_FAULTDETECTORFACTORY_I_H_  */
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
index bba77092823..51b7b9cc432 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
@@ -15,6 +15,8 @@
 #include "FT_FaultDetectorFactory_i.h"
 #include "tao/debug.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 ///////////////////////////////
 // Fault_Detector_i static data
 
@@ -201,3 +203,4 @@ ACE_THR_FUNC_RETURN TAO::Fault_Detector_i::thr_func (void * arg)
   return 0;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
index d5882ad1a15..03642de4b48 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
@@ -28,18 +28,13 @@
 
 #include <ace/Manual_Event.h>
 
-//////////////////////////////////
-// Classes declared in this header
-namespace TAO
-{
-  class  Fault_Detector_i;
-}
-
 
 #include "orbsvcs/FT_NotifierC.h"
 #include "orbsvcs/FT_ReplicaC.h"
 #include "ace/Time_Value.h"
 
+// Classes declared in this header
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -181,5 +176,8 @@ namespace TAO
     int quit_requested_;
   };
 }   // namespace TAO
+
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ <ace/post.h>
 #endif // FAULT_DETECTOR_I_H_
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
index df80f8f8574..e120b9a2cc7 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -49,6 +49,8 @@
   return /* value goes here */
 
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 // Implementation skeleton constructor
 TAO::FT_FaultNotifier_i::FT_FaultNotifier_i ()
   : orb_ (0)
@@ -768,3 +770,5 @@ TAO::FT_FaultNotifier_i::ProxyInfo::ProxyInfo (const ProxyInfo & rhs)
   , proxyVar_ (rhs.proxyVar_)
 {
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
index dd1d000722d..1f5e672eaed 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -27,14 +27,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-//////////////////////////////////
-// Classes declared in this header
-namespace TAO
-{
-  class  FT_FaultNotifier_i;
-}
-
-
 #include <orbsvcs/FT_NotifierS.h>
 #include <orbsvcs/FT_ReplicationManagerC.h>
 #include <orbsvcs/Notify/Notify_EventChannelFactory_i.h>
@@ -43,6 +35,7 @@ namespace TAO
 /////////////////////
 // Forward references
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   class  FT_FaultNotifier_i : public virtual POA_FT::FaultNotifier
@@ -272,6 +265,8 @@ namespace TAO
 
   };
 } // namespace TAO
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_FT_NOTIFIER_I_H_  */
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
index 0953931eca8..7dd3033bcbc 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -22,7 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Reactor;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 class INS_Locator;
 
 // Gets a request from a client and depending on the POA name,
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h
index ecb51d155b1..a32e6747b2a 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -25,7 +25,9 @@
 #include "../orbsvcs/Notify/CosNotify_Initializer.h"
 #include "ace/SString.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_Service;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 #define NOTIFY_KEY "NotifyEventChannelFactory"
 #define NOTIFY_CHANNEL_NAME "NotifyEventChannel"
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h
index 9d40f09e474..ab771b88071 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.h
@@ -95,8 +95,6 @@ private:
   static char* end_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 /// The union used by lex and bison to build the Abstract Syntax Tree.
 typedef union
 {
@@ -106,5 +104,7 @@ typedef union
 extern YYSTYPE yylval;
 extern YYSTYPE yyval;
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 #endif /* TAO_ETCL_INTERPRETER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 870492fbd01..79650d1c7aa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -78,6 +78,8 @@ TAO_EC_Simple_Queue_Full_Action::queue_full_action (TAO_EC_Dispatching_Task * /*
   return this->queue_full_action_return_value_;
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_STATIC_SVC_DEFINE (TAO_EC_Simple_Queue_Full_Action,
                        ACE_TEXT (TAO_EC_DEFAULT_QUEUE_FULL_SERVICE_OBJECT_NAME),
                        ACE_SVC_OBJ_T,
@@ -87,7 +89,7 @@ ACE_STATIC_SVC_DEFINE (TAO_EC_Simple_Queue_Full_Action,
 ACE_FACTORY_DEFINE (TAO_RTEvent_Serv, TAO_EC_Simple_Queue_Full_Action)
 
 
-
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 int
 TAO_EC_Queue::is_full_i (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index a0fd451f08e..45083447074 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-extern unsigned long EC_TPC_debug_level;
-
 #include "EC_TPC_Dispatching.h"
 #include "EC_Defaults.h"
 
@@ -15,6 +13,8 @@ ACE_RCSID(Event, EC_TPC_Dispatching, "$Id$")
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+extern unsigned long EC_TPC_debug_level;
+
 TAO_EC_TPC_Dispatching::TAO_EC_TPC_Dispatching (TAO_EC_Queue_Full_Service_Object* so)
   : consumer_task_map_(TAO_EC_TPC_DISPATCHING_DEFAULT_MAP_SIZE)
   , queue_full_service_object_(so)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
index 17c7fe3203f..655112314ea 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.h
@@ -19,11 +19,15 @@
 #endif /* TAO_EXPORT_MACRO */
 #define TAO_EXPORT_MACRO TAO_Notify_Export
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 namespace TAO_Notify_Extensions
 {
   TAO_NAMESPACE_STORAGE_CLASS const char BlockingPolicy[];
 }
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_NOTIFY_EXTENSIONS_H */