Merge pull request #289 from jwillemsen/master

Revert singleton changes
DOCGroup · Sep 5, 2016 · 3763008 · 3763008
2 parents 90da64f + 4f76403
commit 3763008
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ env:
     - CCMNOEVENT=1 ACEFORTAO=0
     - ACETESTS=1 ACEFORTAO=0
     - USES_WCHAR=1
+    - VERSIONED=1
   global:
     - ACE_ROOT=$TRAVIS_BUILD_DIR/ACE
     - TAO_ROOT=$TRAVIS_BUILD_DIR/TAO
@@ -43,6 +44,7 @@ before_script:
   - if [ "$CCMLW" == "1" ]; then echo -e "ccm_lw=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
   - if [ "$CCMNOEVENT" == "1" ]; then echo -e "ccm_noevent=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
   - if [ "$USES_WCHAR" == "1" ]; then echo -e "uses_wchar=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
+  - if [ "$VERSIONED" == "1" ]; then echo -e "versioned_namespace=1" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features; fi
   - echo -e "xerces3=1\nssl=1\nipv6=1\n" >> $ACE_ROOT/include/makeinclude/platform_macros.GNU
   - echo -e "xerces3=1\nssl=1\n" >> $ACE_ROOT/bin/MakeProjectCreator/config/default.features
   - echo -e "TAO/tests/Hello/run_test.pl" >> $TAO_ROOT/bin/travis-ci.lst

diff --git a/ACE/ace/Based_Pointer_Repository.cpp b/ACE/ace/Based_Pointer_Repository.cpp
@@ -119,8 +119,5 @@ ACE_Based_Pointer_Repository::unbind (void *addr)
 
 ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX);
 
-ACE_SINGLETON_DECLARE (ACE_Singleton,
-                       ACE_Based_Pointer_Repository,
-                       ACE_SYNCH_RW_MUTEX)
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Based_Pointer_Repository.h b/ACE/ace/Based_Pointer_Repository.h
@@ -76,6 +76,11 @@ 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)
+
 /// 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;

diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
@@ -15,8 +15,6 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ACE_SINGLETON_DECLARE (ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX)
-
 namespace ACE_Utils
 {
   // NIL version of the UUID

diff --git a/ACE/ace/UUID.h b/ACE/ace/UUID.h
@@ -275,6 +275,8 @@ namespace ACE_Utils
           UUID_GENERATOR;
 }
 
+ACE_SINGLETON_DECLARE (ACE_Singleton, ACE_Utils::UUID_Generator, ACE_SYNCH_MUTEX)
+
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)

diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1151,9 +1151,3 @@ template ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> *ACE_Singleton<TAO_AV_Core,
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex)
-
-ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -162,6 +162,8 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
+TAO_AV_SINGLETON_DECLARE (ACE_Singleton, TAO_AV_Core, ACE_Null_Mutex)
+
 typedef ACE_Singleton<TAO_AV_Core, ACE_Null_Mutex> TAO_AV_CORE;
 
 ACE_END_VERSIONED_NAMESPACE_DECL

diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -222,5 +222,3 @@ TAO_Notify_Tests_LookupManager::resolve (CosNotifyFilter::FilterAdmin_var& filte
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
 template ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX> *ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX>::singleton_;
 #endif /*ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
-
-TAO_NOTIFY_TEST_SINGLETON_DECLARE (ACE_Singleton, TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX)
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -105,6 +105,8 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_LookupManager
   TAO_Notify_Tests_Priority_Mapping *priority_mapping_;
 };
 
+TAO_NOTIFY_TEST_SINGLETON_DECLARE (ACE_Singleton, TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX)
+
 typedef ACE_Singleton<TAO_Notify_Tests_LookupManager, TAO_SYNCH_MUTEX> _TAO_Notify_Tests_LookupManager;
 
 #define LOOKUP_MANAGER  _TAO_Notify_Tests_LookupManager::instance()

diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp
@@ -457,7 +457,7 @@ Invocation::dump_detail (ostream &strm,
       for (NotifyIncidents::ITERATOR i = this->notify_incidents_.begin();
            !(i.done()); i.advance())
         {
-          ACE_CString *note;
+          ACE_CString *note = 0;
           i.next(note);
           strm << "            " << *note << endl;
         }