summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2014-05-22 18:41:22 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2014-05-22 18:41:22 +0000
commit55f8eecdfdbd09064793a9499600206f277d1291 (patch)
treefe14238d2a5e9b4851c78f7548a8ac125bd84315
parent9b9b3f984cbff385f302af4f64ed7c146cb25e20 (diff)
downloadATCD-55f8eecdfdbd09064793a9499600206f277d1291.tar.gz
Thu May 22 18:40:24 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Dev_Poll_Reactor.cpp: Fixed compile warning in single threaded build
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/ace/Dev_Poll_Reactor.cpp2
2 files changed, 7 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index e8123996273..6688451731f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 22 18:40:24 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/Dev_Poll_Reactor.cpp:
+ Fixed compile warning in single threaded build
+
Thu May 22 11:48:35 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Message_Queue_Test.cpp:
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index 844a02c35d7..9dc4bc1f111 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -2480,9 +2480,11 @@ ACE_Dev_Poll_Reactor::reactor_mask_to_poll_event (ACE_Reactor_Mask mask)
return events;
}
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
namespace {
void polite_sleep_hook (void *) { }
}
+#endif
int
ACE_Dev_Poll_Reactor::Token_Guard::acquire_quietly (ACE_Time_Value *max_wait)