Merge branch 'master' of git://github.com/DOCGroup/ATCD

10 files changed, 20 insertions, 25 deletions

diff --git a/ACE/ace/Based_Pointer_Repository.cpp b/ACE/ace/Based_Pointer_Repository.cpp
index 6ec16f555ca..75727e234a8 100644
--- a/ACE/ace/Based_Pointer_Repository.cpp
+++ b/ACE/ace/Based_Pointer_Repository.cpp
@@ -119,5 +119,8 @@ 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
index 00b6d2c4f6b..1dbb5a20ac1 100644
--- a/ACE/ace/Based_Pointer_Repository.h
+++ b/ACE/ace/Based_Pointer_Repository.h
@@ -76,11 +76,6 @@ private:
 
 // ----------------------------------
 
-/// 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
index dbac895fb8a..5a97c584b04 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -15,6 +15,8 @@
 
 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
index 1e9671214d1..b2308aae9d7 100644
--- a/ACE/ace/UUID.h
+++ b/ACE/ace/UUID.h
@@ -275,8 +275,6 @@ 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/ACE/bin/generate_compile_stats.sh b/ACE/bin/generate_compile_stats.sh
index cbddc963c4c..921119ca869 100755
--- a/ACE/bin/generate_compile_stats.sh
+++ b/ACE/bin/generate_compile_stats.sh
@@ -958,8 +958,7 @@ sort_list ()
     #echo $i
   done
 
-  # sort eats underscores, soo...
-  sed "s/___/000/g" ${DEST}/tmp_list | sort -f | sed "s/000/___/g"
+  sort -f ${DEST}/tmp_list
 }
 
 ###############################################################################
@@ -973,7 +972,7 @@ create_html ()
 
   local DEST=$1
   local TYPE=$2
-  local ALL_BASE=""
+  local ALL_OBJS=""
   local ACE_OBJS=""
   local TAO_OBJS=""
   local CIAO_OBJS=""
@@ -993,7 +992,7 @@ create_html ()
     elif [ "${base}" != "${base#ACE}" ]; then
       ACE_OBJS="${ACE_OBJS} ${base}"
     fi
-    ALL_OBJS="${ALL_BASE} ${base}"
+    ALL_OBJS="${ALL_OBJS} ${base}"
   done
 
   # create main page
@@ -1014,7 +1013,7 @@ create_html ()
       sort_list ${DAnCE_OBJS} | create_page "DAnCE" ${TYPE} > ${DEST}/${name}
     else
       name="all_${TYPE}.html"
-      sort_list ${ACE_OBJS} | create_page $BASE_TITLE ${TYPE} > ${DEST}/${name}
+      sort_list ${ALL_OBJS} | create_page $BASE_TITLE ${TYPE} > ${DEST}/${name}
     fi
   fi
 }
diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index e4b3ee63d0b..430e8bebb58 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -12,15 +12,9 @@ else
   ifneq ($(CROSS_COMPILE),)
     CROSS-COMPILE = 1
     # Build using the cross-tools
-    ifneq ($($CROSS_COMPILE_POSTFIX),)
-      CC  = ${CROSS_COMPILE}gcc{$CROSS_COMPILE_POSTFIX}
-      CXX = ${CROSS_COMPILE}g++{$CROSS_COMPILE_POSTFIX}
-      AR  = ${CROSS_COMPILE}ar{$CROSS_COMPILE_POSTFIX}
-    else
-      CC  = ${CROSS_COMPILE}gcc
-      CXX = ${CROSS_COMPILE}g++
-      AR  = ${CROSS_COMPILE}ar
-    endif
+    CC  = ${CROSS_COMPILE}gcc${CROSS_COMPILE_SUFFIX}
+    CXX = ${CROSS_COMPILE}g++${CROSS_COMPILE_SUFFIX}
+    AR  = ${CROSS_COMPILE}ar${CROSS_COMPILE_SUFFIX}
     # Cross-linker requires this for linked in shared libs that depend
     # themselves on other shared libs (not directly linked in)
     LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index 5c6b24a29bc..d8c88f9c8e4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -1151,3 +1151,9 @@ 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
index 4fea5b533cf..98a0ab923e7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -162,8 +162,6 @@ 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
index f78102f88ef..0ab38637907 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp
@@ -222,3 +222,5 @@ 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
index 6b1db928a77..5d86943f979 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -105,8 +105,6 @@ protected:
   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()