From b34ed8469186160c230eb26e0a503df5edd68298 Mon Sep 17 00:00:00 2001
From: Phil Mesnier <mesnierp@ociweb.com>
Date: Tue, 28 Mar 2017 10:39:14 -0500
Subject: Fuzz and versioned build fixes

---
 .../Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp        | 4 ++++
 .../orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h  | 6 +++++-
 TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp     | 8 ++++----
 TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h       | 4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
index 454391223e3..ce69843d5a6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
@@ -19,6 +19,8 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/Log_Msg.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 FT_Update_Replicant_i::FT_Update_Replicant_i (TAO_FT_Naming_Replication_Manager &owner)
   :owner_ (owner)
 {
@@ -472,3 +474,5 @@ TAO_FT_Naming_Replication_Manager::init_peer (void)
 #endif /* ACE_USES_WCHAR */
   return true;
 }
+
+TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
index 8a9e73a2da7..b812777263b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
-*  @file FT_Naming_Replication_Mang.h
+*  @file FT_Naming_Replication_Manager.h
 *
 *
 *  Based on the replicator class used in the ImR.
@@ -26,6 +26,8 @@
 
 #include <set>
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 class TAO_FT_Naming_Replication_Manager;
 class TAO_FT_Naming_Server;
 
@@ -107,4 +109,6 @@ private:
   bool refresh_peer_;
 };
 
+TAO_END_VERSIONED_NAMESPACE_DECL
+
 #endif /* FT_REPLICATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index 3f303dbe1e2..506d4efafde 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -100,7 +100,7 @@ TAO_FT_Naming_Server::update_info_i (void)
     {
       FT_Naming::UpdateInfoSeq_var block;
       {
-        ACE_GUARD(ACE_Thread_Mutex, guard, this->info_lock_);
+        ACE_GUARD(TAO_SYNCH_MUTEX, guard, this->info_lock_);
         if (this->u_infos_.dequeue_head(block.out()) == -1)
           {
             break;
@@ -132,7 +132,7 @@ TAO_FT_Naming_Server::update_info (FT_Naming::UpdateInfoSeq &infos)
   FT_Naming::UpdateInfoSeq* block = 0;
   ACE_NEW(block, FT_Naming::UpdateInfoSeq (count,count,guts,true));
   {
-    ACE_GUARD(ACE_Thread_Mutex, guard, this->info_lock_);
+    ACE_GUARD(TAO_SYNCH_MUTEX, guard, this->info_lock_);
     this->u_infos_.enqueue_tail (block);
   }
 
@@ -146,7 +146,7 @@ TAO_FT_Naming_Server::update_iors_i (void)
     {
       FT_Naming::ReplicaInfo rep;
       {
-        ACE_GUARD(ACE_Thread_Mutex, guard, this->ior_lock_);
+        ACE_GUARD(TAO_SYNCH_MUTEX, guard, this->ior_lock_);
         if (this->u_iors_.dequeue_head(rep) == -1)
           {
             break;
@@ -171,7 +171,7 @@ void
 TAO_FT_Naming_Server::update_iors (const FT_Naming::ReplicaInfo & iors )
 {
   {
-    ACE_GUARD(ACE_Thread_Mutex, guard, this->ior_lock_);
+    ACE_GUARD(TAO_SYNCH_MUTEX, guard, this->ior_lock_);
     this->u_iors_.enqueue_tail(iors);
   }
   this->orb_->orb_core ()->reactor ()->notify (&this->ior_notifier_);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
index 500af100254..791a0fed973 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h
@@ -197,8 +197,8 @@ protected:
 
   ACE_Unbounded_Queue<FT_Naming::ReplicaInfo> u_iors_;
   ACE_Unbounded_Queue<FT_Naming::UpdateInfoSeq*> u_infos_;
-  ACE_Thread_Mutex ior_lock_;
-  ACE_Thread_Mutex info_lock_;
+  TAO_SYNCH_MUTEX ior_lock_;
+  TAO_SYNCH_MUTEX info_lock_;
 
 
  };
-- 
cgit v1.2.1