From a0254dacc11a8371a153df228867cb830377af7d Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 22 Apr 2024 11:45:14 +0200
Subject: [PATCH] Fix compile warning with bcc64x

Fix compile warnings with bcc64x
---
 TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp | 4 ++--
 TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h   | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
index b9355cbcd72..fce6c98b4b1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -14,7 +14,6 @@ GroupInfoPublisherBase::GroupInfoPublisherBase()
   info_->primary = false;
 }
 
-
 void
 GroupInfoPublisherBase::subscribe(TAO_FTEC_Become_Primary_Listener* listener)
 {
@@ -51,7 +50,6 @@ GroupInfoPublisherBase::backups() const
   return info_->backups;
 }
 
-
 GroupInfoPublisherBase::Info*
 GroupInfoPublisherBase::setup_info(const FTRT::ManagerInfoList & info_list,
                                    int my_position,
@@ -143,7 +141,9 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info)
   }
   info_ = std::move(info);
 }
+
 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 b4f6b370283..ad3f8e70162 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -39,7 +39,6 @@ public:
   };
 
   typedef std::unique_ptr<Info> Info_ptr;
-  friend class ACE_Singleton<GroupInfoPublisherBase, TAO_SYNCH_MUTEX>;
 
   void subscribe(TAO_FTEC_Become_Primary_Listener* listener);
   void set_naming_context(CosNaming::NamingContext_var naming_context);
@@ -61,19 +60,19 @@ public:
 
   void object_id(const char* oid);
   void name(const char* nam);
-
-private:
   GroupInfoPublisherBase();
 
+private:
   CosNaming::NamingContext_var naming_context_;
   typedef ACE_Vector<TAO_FTEC_Become_Primary_Listener*, 2> Subscribers;
-  Subscribers  subscribers_;
+  Subscribers subscribers_;
   PortableServer::ObjectId object_id_;
   CosNaming::Name name_;
   Info_ptr info_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_FTRTEC_SINGLETON_DECLARE(ACE_Singleton, GroupInfoPublisherBase, TAO_SYNCH_MUTEX)
-- 
2.11.4.GIT