summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarvindk <arvindk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-08-28 19:17:03 +0000
committerarvindk <arvindk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-08-28 19:17:03 +0000
commitd724323ba1bc20bdd58c70485599b64b95d5490a (patch)
tree3e62239dd2921aa23ea2d84ffbd13b2db65278d9
parentb568d811fd29dedea7962d008a77b1f2539fe76d (diff)
downloadATCD-d724323ba1bc20bdd58c70485599b64b95d5490a.tar.gz
ChangelogTag: Sun Aug 28 14:13:25 2005 Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
-rw-r--r--ChangeLog10
-rw-r--r--ace/Log_Msg.cpp4
-rw-r--r--ace/Naming_Context.cpp1
-rw-r--r--ace/Object_Manager.cpp4
4 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 84d9b904764..d2fc61d2ff9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Aug 28 14:13:25 2005 Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
+
+ * ace/Object_Manager.cpp:
+ * ace/Naming_Context.cpp:
+ * ace/Log_Msg.cpp:
+
+ When ACE_HAS_TRACE flag is defined, the aforementioned files did
+ not include the Trace.h include. This commit fixes the
+ resulting compilation problems.
+
Fri Aug 26 18:01:31 2005 Steve Huston <shuston@riverace.com>
* ace/Select_Reactor.cpp:
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index cdafca2596c..e566a3e0c04 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -29,6 +29,10 @@
# include "ace/streams.h"
#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+#if defined (ACE_HAS_TRACE)
+# include "ace/Trace.h"
+#endif /* ACE_HAS_TRACE */
+
#include "ace/Log_Msg.h"
#include "ace/Log_Msg_Callback.h"
#include "ace/Log_Msg_IPC.h"
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index 9e01e1669ca..7f79e6edb22 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -11,6 +11,7 @@
#include "ace/OS_NS_unistd.h"
#if defined (ACE_HAS_TRACE)
# include "ace/OS_NS_strings.h"
+# include "ace/Trace.h"
#endif /* ACE_HAS_TRACE */
ACE_RCSID(ace, Naming_Context, "$Id$")
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index 024d9b4acb0..afb84dfb7b9 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -18,6 +18,10 @@
#include "ace/Atomic_Op.h"
#include "ace/OS_NS_sys_time.h"
+#if defined (ACE_HAS_TRACE)
+#include "ace/Trace.h"
+#endif /* ACE_HAS_TRACE */
+
#if !defined (__ACE_INLINE__)
# include "ace/Object_Manager.inl"
#endif /* __ACE_INLINE__ */