Thu Aug 16 13:43:39 UTC 2012 Martin Corino <mcorino@remedy.nl>

5 files changed, 30 insertions, 5 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 004dd6dd8b5..8c7180e4ca6 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,10 +1,17 @@
+Thu Aug 16 13:43:39 UTC 2012  Martin Corino  <mcorino@remedy.nl>
+
+        * ace/Message_Queue_T.cpp:
+        * ace/Stream.cpp:
+        * ace/Thread_Manager.cpp:
+        * tests/Bug_4055_Regression_Test.cpp:
+          Fixed problems with single threaded builds.
+
 Thu Aug 16 12:44:05 UTC 2012  Martin Corino  <mcorino@remedy.nl>
 
         * ace/Task_T.inl:
         * ace/Time_Policy_T.inl:
           Fuzz fixes.
 
-=======
 Thu Aug 16 09:43:00 UTC 2012  Simon Massey <sma at prismtech dot com>
 
         * test/Bug_3943_Regression_Test.cpp:
diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp
index b80c7f7372e..ee9d08bdace 100644
--- a/ACE/ace/Message_Queue_T.cpp
+++ b/ACE/ace/Message_Queue_T.cpp
@@ -1045,8 +1045,13 @@ template <ACE_SYNCH_DECL, class TIME_POLICY>
 ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue (size_t hwm,
                                                      size_t lwm,
                                                      ACE_Notification_Strategy *ns)
+#if defined (ACE_HAS_THREADS)
   : not_empty_cond_ (lock_, ACE_Condition_Attributes_T<TIME_POLICY> ())
   , not_full_cond_ (lock_, ACE_Condition_Attributes_T<TIME_POLICY> ())
+#else
+  : not_empty_cond_ (lock_)
+  , not_full_cond_ (lock_)
+#endif
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE, TIME_POLICY>::ACE_Message_Queue");
 
diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp
index ba8ef031065..fc0a4d870c3 100644
--- a/ACE/ace/Stream.cpp
+++ b/ACE/ace/Stream.cpp
@@ -604,7 +604,11 @@ ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream (void * a,
   : stream_head_ (0),
     stream_tail_ (0),
     linked_us_ (0),
+#if defined (ACE_HAS_THREADS)
     final_close_ (lock_, ACE_Condition_Attributes_T<TIME_POLICY> ())
+#else
+    final_close_ (lock_)
+#endif
 {
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE, TIME_POLICY>::ACE_Stream");
   if (this->open (a, head, tail) == -1)
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
index 193add0fa9d..c3cc9d01d32 100644
--- a/ACE/ace/Thread_Manager.cpp
+++ b/ACE/ace/Thread_Manager.cpp
@@ -387,6 +387,9 @@ ACE_Thread_Manager::ACE_Thread_Manager (const ACE_Condition_Attributes &attribut
     , thread_desc_freelist_ (ACE_FREE_LIST_WITH_POOL,
                              prealloc, lwm, hwm, inc)
 {
+#if !defined (ACE_HAS_THREADS)
+  ACE_UNUSED_ARG (attributes);
+#endif /* ACE_HAS_THREADS */
   ACE_TRACE ("ACE_Thread_Manager::ACE_Thread_Manager");
 }
 
diff --git a/ACE/tests/Bug_4055_Regression_Test.cpp b/ACE/tests/Bug_4055_Regression_Test.cpp
index 1e15f14f1c7..e462934a5bc 100644
--- a/ACE/tests/Bug_4055_Regression_Test.cpp
+++ b/ACE/tests/Bug_4055_Regression_Test.cpp
@@ -28,9 +28,11 @@
      (defined (_POSIX_MONOTONIC_CLOCK) && !defined (ACE_LACKS_MONOTONIC_TIME)) || \
      defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC)
 
-# if defined (ACE_WIN32)
-#   include "ace/Date_Time.h"
-# endif
+# if defined (ACE_HAS_THREADS)
+
+#   if defined (ACE_WIN32)
+#     include "ace/Date_Time.h"
+#   endif
 
 // Create timer queue with hr support
 ACE_Timer_Queue *
@@ -312,11 +314,13 @@ bool test_timer (ACE_Condition_Thread_Mutex& condition_, ACE_Time_Value& waittim
 
   return status;
 }
+# endif
 
 int
 run_main (int , ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Bug_4055_Regression_Test"));
+# if defined (ACE_HAS_THREADS)
   int status = 1;
 
   ACE_Thread_Mutex mutex_;
@@ -339,7 +343,9 @@ run_main (int , ACE_TCHAR *[])
         status = 0;
     }
   }
-
+# else
+  int status = 0;
+# endif
   ACE_END_TEST;
   return status;
 }