Wed Aug 15 12:09:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 26 insertions, 15 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a7107e1fe59..5520c99b6f2 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,14 @@
+Wed Aug 15 12:09:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/CDR_Stream.cpp:
+          Const and layout changes
+
+        * ace/config-linux-common.h:
+          Removed unneeded space
+
+        * ace/config-posix.h:
+          Only test semaphare support in a multi threaded build
+
 Tue Aug 14 23:28:07 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * tests/ACE_Init_Test.h:
diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp
index 07d4b68ce67..24bf3c4efc9 100644
--- a/ACE/ace/CDR_Stream.cpp
+++ b/ACE/ace/CDR_Stream.cpp
@@ -378,7 +378,7 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
        i != 0;
        i = i->cont ())
     {
-      const size_t length = i->length ();
+      size_t const length = i->length ();
 
       // If the mb does not own its data we are forced to make a copy.
       if (ACE_BIT_ENABLED (i->flags (),
@@ -1761,8 +1761,7 @@ ACE_InputCDR::clone_from (ACE_InputCDR &cdr)
 ACE_Message_Block*
 ACE_InputCDR::steal_contents (void)
 {
-  ACE_Message_Block* block =
-    this->start_.clone ();
+  ACE_Message_Block* block = this->start_.clone ();
   this->start_.data_block (block->data_block ()->clone ());
 
   // If at all our message had a DONT_DELETE flag set, just clear it
@@ -1777,8 +1776,7 @@ ACE_InputCDR::steal_contents (void)
 void
 ACE_InputCDR::reset_contents (void)
 {
-  this->start_.data_block (this->start_.data_block ()->clone_nocopy
-                           ());
+  this->start_.data_block (this->start_.data_block ()->clone_nocopy ());
 
   // Reset the flags...
   this->start_.clr_self_flags (ACE_Message_Block::DONT_DELETE);
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index c6ae3b86086..f4ee58b649c 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -29,7 +29,7 @@
 
 #if defined (ACE_HAS_LINUX_NPTL)
   // Temporary fix because NPTL kernels do have shm_open but there is a problem
-  // with shm_open/shm_unlink pairing in ACE which  needs to be fixed when I have time.
+  // with shm_open/shm_unlink pairing in ACE which needs to be fixed when I have time.
 # if defined (ACE_HAS_SHM_OPEN)
 #   undef ACE_HAS_SHM_OPEN
 # endif /* ACE_HAS_SHM_OPEN */
diff --git a/ACE/ace/config-posix.h b/ACE/ace/config-posix.h
index dc1f0091ab5..e571574a5c4 100644
--- a/ACE/ace/config-posix.h
+++ b/ACE/ace/config-posix.h
@@ -22,16 +22,18 @@
 # endif /* ACE_HAS_AIO_CALLS */
 #endif /* _POSIX_ASYNCHRONOUS_IO */
 
-#if defined(_POSIX_SEMAPHORES) && (_POSIX_SEMAPHORES-0 != -1 )
-# if !defined(ACE_HAS_POSIX_SEM)
-#  define ACE_HAS_POSIX_SEM
-# endif /* ACE_HAS_POSIX_SEM */
-# if defined(ACE_HAS_POSIX_SEM)
-#  if !defined (ACE_HAS_POSIX_SEM_TIMEOUT) && defined (_POSIX_TIMEOUTS)
-#    define ACE_HAS_POSIX_SEM_TIMEOUT
-#  endif /* ACE_HAS_POSIX_SEM_TIMEOUT && _POSIX_TIMEOUTS */
+#if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE != 0)
+# if defined(_POSIX_SEMAPHORES) && (_POSIX_SEMAPHORES-0 != -1 )
+#  if !defined(ACE_HAS_POSIX_SEM)
+#   define ACE_HAS_POSIX_SEM
+#  endif /* ACE_HAS_POSIX_SEM */
+#  if defined(ACE_HAS_POSIX_SEM)
+#   if !defined (ACE_HAS_POSIX_SEM_TIMEOUT) && defined (_POSIX_TIMEOUTS)
+#     define ACE_HAS_POSIX_SEM_TIMEOUT
+#   endif /* ACE_HAS_POSIX_SEM_TIMEOUT && _POSIX_TIMEOUTS */
+#  endif /* ACE_HAS_POSIX_SEM */
 # endif /* ACE_HAS_POSIX_SEM */
-#endif /* ACE_HAS_POSIX_SEM */
+#endif /* !ACE_MT_SAFE */
 
 #if defined(_POSIX_SHARED_MEMORY_OBJECTS) && (_POSIX_SHARED_MEMORY_OBJECTS-0 != -1 )
 # if !defined(ACE_HAS_SHM_OPEN)