Changes to attempt to silence bcc64x

* ACE/ace/Based_Pointer_Repository.h: * ACE/ace/UUID.h:
DOCGroup · Apr 16, 2024 · 6a9352f · 6a9352f
1 parent 42e242e
commit 6a9352f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/ACE/ace/Based_Pointer_Repository.h b/ACE/ace/Based_Pointer_Repository.h
@@ -75,13 +75,10 @@ class ACE_Export ACE_Based_Pointer_Repository
 // ----------------------------------
 
 /// Declare a process wide singleton
-ACE_SINGLETON_DECLARE (ACE_Singleton,
-                       ACE_Based_Pointer_Repository,
-                       ACE_SYNCH_RW_MUTEX)
+ACE_SINGLETON_DECLARE (ACE_Singleton, ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX)
 
 /// Provide a Singleton access point to the based pointer repository.
-typedef ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>
-        ACE_BASED_POINTER_REPOSITORY;
+typedef ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> ACE_BASED_POINTER_REPOSITORY;
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 

diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h
@@ -269,13 +269,15 @@ namespace ACE_Utils
     /// Initialization state of the generator.
     bool is_init_;
   };
-
-  typedef ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX>
-          UUID_GENERATOR;
 }
 
 ACE_SINGLETON_DECLARE (ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX)
 
+namespace ACE_Utils
+{
+  typedef ACE_Singleton <ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX> UUID_GENERATOR;
+}
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)