1 files changed, 5 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index 8a3938a6c65..8b5b14f8acd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -15,10 +15,7 @@
 #include "orbsvcs/FTRT_GroupManagerS.h"
 #include "ace/Auto_Event.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ObjectGroupManagerHandler
-  : public POA_FTRT::AMI_ObjectGroupManagerHandler
+class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler
 {
 public:
   ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups);
@@ -27,28 +24,28 @@ public:
                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start_excep (::Messaging::ExceptionHolder * excep_holder
+  virtual void start_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
                             ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void create_group (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void create_group_excep (::Messaging::ExceptionHolder * excep_holder
+  virtual void create_group_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
                                    ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void add_member (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void add_member_excep (::Messaging::ExceptionHolder * excep_holder
+  virtual void add_member_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void set_state (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder
+  virtual void set_state_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
@@ -56,6 +53,4 @@ private:
   ACE_Atomic_Op< ACE_SYNCH_MUTEX, int > num_backups_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #endif