Fri Sep 17 07:16:16 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/Log_Msg.h:
        * ace/OS_Errno.cpp:
          Layout changes

        * ace/Malloc_T.h:
        * ace/Malloc_T.cpp:
        * ace/Map_Manager.inl:
        * ace/Map_Manager.cpp:
          Moved some methods inline          

        * ace/OS_NS_signal.cpp:
          Fixed problem with versioned macros

8 files changed, 71 insertions, 55 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 1592771a0fb..c2a1b0b7d09 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,18 @@
+Fri Sep 17 07:16:16 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Log_Msg.h:
+        * ace/OS_Errno.cpp:
+          Layout changes
+
+        * ace/Malloc_T.h:
+        * ace/Malloc_T.cpp:
+        * ace/Map_Manager.inl:
+        * ace/Map_Manager.cpp:
+          Moved some methods inline
+
+        * ace/OS_NS_signal.cpp:
+          Fixed problem with versioned macros
+
 Thu Sep 16 13:36:51 UTC 2010  Martin Corino  <mcorino@remedy.nl>
 
         * protocols\ace\INet\ClientRequestHandler.h:
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h
index 00d7c30ff28..58c5457e046 100644
--- a/ACE/ace/Log_Msg.h
+++ b/ACE/ace/Log_Msg.h
@@ -124,7 +124,6 @@
 // that #define STDERR or THREAD (e.g. LynxOS). We simply #undef
 // these macros as there is no way to save the macro definition using
 // the pre-processor. See Bugzilla Bug #299 for more info.
-
 #if defined (STDERR)
 # undef STDERR
 #endif /* STDERR */
diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp
index 395666cb209..1e246807930 100644
--- a/ACE/ace/Malloc_T.cpp
+++ b/ACE/ace/Malloc_T.cpp
@@ -299,6 +299,18 @@ ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const char *pool_name)
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
 }
 
+template <class MALLOC>
+ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (
+  const char *pool_name,
+  const char *lock_name,
+  MEMORY_POOL_OPTIONS options)
+    : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name),
+                  ACE_TEXT_CHAR_TO_TCHAR (lock_name),
+                  options)
+{
+  ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
+}
+
 #if defined (ACE_HAS_WCHAR)
 template <class MALLOC>
 ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const wchar_t *pool_name)
@@ -306,6 +318,18 @@ ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const wchar_t *pool_name)
 {
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
 }
+
+template <class MALLOC>
+ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (
+  const wchar_t *pool_name,
+  const wchar_t *lock_name,
+  MEMORY_POOL_OPTIONS options)
+    : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name),
+                  ACE_TEXT_WCHAR_TO_TCHAR (lock_name),
+                  options)
+{
+  ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
+}
 #endif /* ACE_HAS_WCHAR */
 
 template <class MALLOC>
diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h
index 6089fbbf0e5..468baaffa5b 100644
--- a/ACE/ace/Malloc_T.h
+++ b/ACE/ace/Malloc_T.h
@@ -226,17 +226,10 @@ public:
    * Note that @a pool_name should be located in
    * a directory with the appropriate visibility and protection so
    * that all processes that need to access it can do so.
-   * This constructor must be inline to avoid bugs with some C++
-   * compilers. */
+   */
   ACE_Allocator_Adapter (const char *pool_name,
                          const char *lock_name,
-                         MEMORY_POOL_OPTIONS options = 0)
-      : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name),
-                    ACE_TEXT_CHAR_TO_TCHAR (lock_name),
-                    options)
-    {
-      ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
-    }
+                         MEMORY_POOL_OPTIONS options = 0);
 
 #if defined (ACE_HAS_WCHAR)
   /**
@@ -249,17 +242,10 @@ public:
    * Note that @a pool_name should be located in
    * a directory with the appropriate visibility and protection so
    * that all processes that need to access it can do so.
-   * This constructor must be inline to avoid bugs with some C++
-   * compilers. */
+   */
   ACE_Allocator_Adapter (const wchar_t *pool_name,
                          const wchar_t *lock_name,
-                         MEMORY_POOL_OPTIONS options = 0)
-      : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name),
-                    ACE_TEXT_WCHAR_TO_TCHAR (lock_name),
-                    options)
-    {
-      ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
-    }
+                         MEMORY_POOL_OPTIONS options = 0);
 #endif /* ACE_HAS_WCHAR */
 
   /// Destructor.
diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp
index 85957918df4..90854213915 100644
--- a/ACE/ace/Map_Manager.cpp
+++ b/ACE/ace/Map_Manager.cpp
@@ -640,38 +640,6 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-template <class EXT_ID, class INT_ID, class ACE_LOCK>
-ACE_Map_Entry<EXT_ID, INT_ID>&
-ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
-{
-  // @@ This function should be inlined.  We moved it here to avoid a
-  // compiler bug in SunCC 4.2.  Once we know the correct patch to fix
-  // the compiler problem, it should be moved back to .i file again.
-  ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
-
-  int result = this->next (retv);
-  ACE_ASSERT (result != 0);
-  ACE_UNUSED_ARG (result);
-
-  return *retv;
-}
-
-template <class EXT_ID, class INT_ID, class ACE_LOCK>
-ACE_Map_Entry<EXT_ID, INT_ID>&
-ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
-{
-  // @@ This function should be inlined.  We moved it here to avoid a
-  // compiler bug in SunCC 4.2.  Once we know the correct patch to fix
-  // the compiler problem, it should be moved back to .i file again.
-  ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
-
-  int result = this->next (retv);
-  ACE_ASSERT (result != 0);
-  ACE_UNUSED_ARG (result);
-
-  return *retv;
-}
-
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 {
diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl
index cbbc108bcf2..6e0ff227a1d 100644
--- a/ACE/ace/Map_Manager.inl
+++ b/ACE/ace/Map_Manager.inl
@@ -726,4 +726,31 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (int)
   return retv;
 }
 
+template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
+ACE_Map_Entry<EXT_ID, INT_ID>&
+ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
+{
+  ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
+
+  int const result = this->next (retv);
+  ACE_ASSERT (result != 0);
+  ACE_UNUSED_ARG (result);
+
+  return *retv;
+}
+
+template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
+ACE_Map_Entry<EXT_ID, INT_ID>&
+ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
+{
+  ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
+
+  int const result = this->next (retv);
+  ACE_ASSERT (result != 0);
+  ACE_UNUSED_ARG (result);
+
+  return *retv;
+}
+
+
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/OS_Errno.cpp b/ACE/ace/OS_Errno.cpp
index 44d7cd8f0d2..6bb04208d7d 100644
--- a/ACE/ace/OS_Errno.cpp
+++ b/ACE/ace/OS_Errno.cpp
@@ -3,8 +3,6 @@
 
 #include "ace/OS_Errno.h"
 
-
-
 // Inlining this class on debug builds with gcc on Solaris can cause
 // deadlocks during static initialization. On non debug builds it
 // causes compilation errors.
diff --git a/ACE/ace/OS_NS_signal.cpp b/ACE/ace/OS_NS_signal.cpp
index 0917152ca67..8b708e44859 100644
--- a/ACE/ace/OS_NS_signal.cpp
+++ b/ACE/ace/OS_NS_signal.cpp
@@ -6,8 +6,6 @@
 # include "ace/OS_NS_signal.inl"
 #endif /* ACE_HAS_INLINED_OSCALLS */
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
 #if !defined (ACE_HAS_SIGINFO_T)
 siginfo_t::siginfo_t (ACE_HANDLE handle)
   : si_handle_ (handle),
@@ -22,4 +20,5 @@ siginfo_t::siginfo_t (ACE_HANDLE *handles)
 }
 #endif /* ACE_HAS_SIGINFO_T */
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 ACE_END_VERSIONED_NAMESPACE_DECL