Fix issues with explicit template instantiation with versioned namespace

6 files changed, 20 insertions, 11 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 258748474d7..3290a0422df 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1146,7 +1146,11 @@ TAO_AV_Core::get_control_flowname(const char *flowname)
   return flowname;
 }
 
-ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex);
-
 
 TAO_END_VERSIONED_NAMESPACE_DECL
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex);
+
+ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index e3f519b6152..3d105ee5ea7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -5,6 +5,7 @@
 #include "ace/ARGV.h"
 #include "ace/OS_NS_strings.h"
 
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // default arguments to pass to use for the ORB
@@ -840,7 +841,7 @@ TAO_SFP_Object::TAO_SFP_Object (TAO_AV_Callback *callback,
    max_credit_ (-1),
    current_credit_ (-1)
 {
-  TAO_SFP_BASE::instance ();
+  ACE_Singleton <TAO_SFP_Base,TAO_SYNCH_MUTEX>::instance ();
   this->state_.static_frame_.size (2* this->transport_->mtu ());
 }
 
@@ -1320,7 +1321,7 @@ TAO_SFP_Frame_State::reset (void)
   return 0;
 }
 
-ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_SFP_Base,  TAO_SYNCH_MUTEX);
+//ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, TAO_SFP_Base,  TAO_SYNCH_MUTEX);
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index ec35e78373c..6b68ed3bb97 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -207,7 +207,7 @@ protected:
 };
 
 // Beware the SFP_Base code relies on the Singleton being initialized.
-typedef ACE_Singleton <TAO_SFP_Base,TAO_SYNCH_MUTEX> TAO_SFP_BASE;
+// typedef ACE_Singleton <TAO_SFP_Base,TAO_SYNCH_MUTEX> TAO_SFP_BASE;
 
 /**
  * @class TAO_SFP_Object
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index 7b204e99b7c..a2280c5c416 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -146,7 +146,8 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info)
   }
   info_ = info;
 }
-
-ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, GroupInfoPublisherBase,  TAO_SYNCH_MUTEX);
-
 TAO_END_VERSIONED_NAMESPACE_DECL
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, GroupInfoPublisherBase,  TAO_SYNCH_MUTEX)
+ACE_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index bc2678d7120..23cffbeebb4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -10,7 +10,7 @@
 
 #ifndef GROUPINFOPUBLISHER_H
 #define GROUPINFOPUBLISHER_H
-
+#include "ftrtec_export.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Vector_T.h"
@@ -73,8 +73,12 @@ private:
   Info_ptr info_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+    
+TAO_FTRTEC_SINGLETON_DECLARE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX)    
 typedef ACE_Singleton<GroupInfoPublisherBase, TAO_SYNCH_MUTEX> GroupInfoPublisher;
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 43f90c1aedb..1190037fc93 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -775,6 +775,5 @@ ACE_Scheduler_Factory::set_preemption_priority
 #endif /* HPUX && !g++ */
 }
 
-ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Scheduler_Factory_Data,  ACE_Null_Mutex);
 
 TAO_END_VERSIONED_NAMESPACE_DECL