summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2012-01-26 20:44:12 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2012-01-26 20:44:12 +0000
commit9825905a3bbc461406a7c673619e7240a3b0e2a9 (patch)
treeb45eace24b5e846b65d415af4dc83f493c697dae
parentad8dd0deb65b4a7d5a3f34311322102ce3776463 (diff)
downloadATCD-9825905a3bbc461406a7c673619e7240a3b0e2a9.tar.gz
Thu Jan 26 20:38:47 UTC 2012 Phil Mesnier <mesnier_p@ociweb.com>
* ace/Condition_T.cpp: In order to allow building with inlining on MacOSX Lion, Condition_T.cpp needs to explicitly include Time_Value.h. In many cases, Time_Value.h was being incidentally included, such as through Atomic_Op_GCC_T.cpp, but that is specifically excluded for Lion builds using the clang compiler.
-rw-r--r--ACE/ChangeLog10
-rw-r--r--ACE/ace/Condition_T.cpp1
2 files changed, 11 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 627cf06fa91..9740405b5fa 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,13 @@
+Thu Jan 26 20:38:47 UTC 2012 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * ace/Condition_T.cpp:
+
+ In order to allow building with inlining on MacOSX Lion,
+ Condition_T.cpp needs to explicitly include Time_Value.h. In many
+ cases, Time_Value.h was being incidentally included, such as
+ through Atomic_Op_GCC_T.cpp, but that is specifically excluded for
+ Lion builds using the clang compiler.
+
Tue Jan 24 16:44:22 UTC 2012 Chip Jones <jonesc@ociweb.com>
* NEWS:
diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp
index 0e2c465f75f..cdfb6dd21bd 100644
--- a/ACE/ace/Condition_T.cpp
+++ b/ACE/ace/Condition_T.cpp
@@ -15,6 +15,7 @@
#if !defined (__ACE_INLINE__)
#include "ace/Condition_T.inl"
+#include "ace/Time_Value.h"
#endif /* __ACE_INLINE__ */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL