summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2002-01-31 22:39:39 +0000
committerSteve Huston <shuston@riverace.com>2002-01-31 22:39:39 +0000
commit1431c86f632b6739501b877e18bdb1d052c63966 (patch)
tree4c02da4598185ea96527ddad625fa66d2b976636
parentf493a48b9bc5b4e3b9ce7cb925eedd36571fc023 (diff)
downloadATCD-1431c86f632b6739501b877e18bdb1d052c63966.tar.gz
ChangeLogTag:Thu Jan 31 17:21:49 2002 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog14
-rw-r--r--ChangeLogs/ChangeLog-02a14
-rw-r--r--ChangeLogs/ChangeLog-03a14
-rw-r--r--ace/Trace.cpp8
4 files changed, 48 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e175f981102..ce53448c2d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Thu Jan 31 17:21:49 2002 Steve Huston <shuston@riverace.com>
+
+ * ace/Trace.cpp (constructor and destructor): Do not attempt
+ trace output if ACE has not been initialized. There is too
+ much not set up yet to bother trying. If you are on a platform
+ with ACE_HAS_NONSTATIC_OBJECT_MANAGER (such as Windows) and you
+ really, really need tracing in static objects, you should
+ try #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0 in your config.h
+ along with #define ACE_NTRACE 0. Beware, though, there are
+ crocodiles lurking there - platforms defined to use non-static
+ object manager are that way for good reason.
+
+ Thank you to Shmulik Regev <shmul@vself.com> for reporting this.
+
Thu Jan 31 13:32:07 2002 Nanbor Wang <nanbor@cs.wustl.edu>
* XML/common/XML_Common.dsp: Fixed the LIB path to use relative
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index e175f981102..ce53448c2d5 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,17 @@
+Thu Jan 31 17:21:49 2002 Steve Huston <shuston@riverace.com>
+
+ * ace/Trace.cpp (constructor and destructor): Do not attempt
+ trace output if ACE has not been initialized. There is too
+ much not set up yet to bother trying. If you are on a platform
+ with ACE_HAS_NONSTATIC_OBJECT_MANAGER (such as Windows) and you
+ really, really need tracing in static objects, you should
+ try #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0 in your config.h
+ along with #define ACE_NTRACE 0. Beware, though, there are
+ crocodiles lurking there - platforms defined to use non-static
+ object manager are that way for good reason.
+
+ Thank you to Shmulik Regev <shmul@vself.com> for reporting this.
+
Thu Jan 31 13:32:07 2002 Nanbor Wang <nanbor@cs.wustl.edu>
* XML/common/XML_Common.dsp: Fixed the LIB path to use relative
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e175f981102..ce53448c2d5 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,17 @@
+Thu Jan 31 17:21:49 2002 Steve Huston <shuston@riverace.com>
+
+ * ace/Trace.cpp (constructor and destructor): Do not attempt
+ trace output if ACE has not been initialized. There is too
+ much not set up yet to bother trying. If you are on a platform
+ with ACE_HAS_NONSTATIC_OBJECT_MANAGER (such as Windows) and you
+ really, really need tracing in static objects, you should
+ try #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0 in your config.h
+ along with #define ACE_NTRACE 0. Beware, though, there are
+ crocodiles lurking there - platforms defined to use non-static
+ object manager are that way for good reason.
+
+ Thank you to Shmulik Regev <shmul@vself.com> for reporting this.
+
Thu Jan 31 13:32:07 2002 Nanbor Wang <nanbor@cs.wustl.edu>
* XML/common/XML_Common.dsp: Fixed the LIB path to use relative
diff --git a/ace/Trace.cpp b/ace/Trace.cpp
index 8534da3f14c..e85ecfc4a6f 100644
--- a/ace/Trace.cpp
+++ b/ace/Trace.cpp
@@ -84,7 +84,9 @@ ACE_Trace::ACE_Trace (const ACE_TCHAR *n,
this->name_ = n;
- if (ACE_Trace::enable_tracing_)
+ // If ACE has not yet been initialized, don't try to trace... there's
+ // too much stuff not yet initialized.
+ if (ACE_Trace::enable_tracing_ && !ACE_OS_Object_Manager::starting_up ())
{
ACE_Log_Msg *lm = ACE_LOG_MSG;
if (lm->tracing_enabled ()
@@ -108,7 +110,9 @@ ACE_Trace::ACE_Trace (const ACE_TCHAR *n,
ACE_Trace::~ACE_Trace (void)
{
- if (ACE_Trace::enable_tracing_)
+ // If ACE has not yet been initialized, don't try to trace... there's
+ // too much stuff not yet initialized.
+ if (ACE_Trace::enable_tracing_ && !ACE_OS_Object_Manager::starting_up ())
{
ACE_Log_Msg *lm = ACE_LOG_MSG;
if (lm->tracing_enabled ()