diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2007-01-04 15:55:11 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2007-01-04 15:55:11 +0000 |
| commit | a9c5f6c11ddddbbfd73773345a170d43450663e6 (patch) | |
| tree | e51359759b8e6d3b40e0b123588e814ac8b0bc21 | |
| parent | da2fb0a552bfd7c914c2aba33f9f1f41654f8d7a (diff) | |
| download | ATCD-a9c5f6c11ddddbbfd73773345a170d43450663e6.tar.gz | |
ChangeLogTag: Thu Jan 4 15:51:41 UTC 2007 Chris Cleeland <cleeland_c@ociweb.com>
Fixed compile problem in build Win2003_VC71_NoInline_MFC/2007_01_04_08_24_Full.html
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/tests/Thread_Creation_Threshold_Test.cpp | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 09f97907d67..cf92863af63 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Thu Jan 4 15:51:41 UTC 2007 Chris Cleeland <cleeland_c@ociweb.com> + + * tests/Thread_Creation_Threshold_Test.cpp: Changed name of + anonymous namespace constant from DEBUG to PRINT_DEBUG_MSGS to + avoid potential conflicts with #defines. This should clean up + at least one Windows build, and possibly others as well. + Thu Jan 4 15:33:08 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com> * configure.ac: diff --git a/ACE/tests/Thread_Creation_Threshold_Test.cpp b/ACE/tests/Thread_Creation_Threshold_Test.cpp index 7145b5350be..e42a3b55630 100644 --- a/ACE/tests/Thread_Creation_Threshold_Test.cpp +++ b/ACE/tests/Thread_Creation_Threshold_Test.cpp @@ -41,7 +41,7 @@ const unsigned long MAX_THREAD = 100000; namespace { // Change this to 'true' if you want lots of debugging messages in the log - const bool DEBUG = true; + const bool PRINT_DEBUG_MSGS = true; }; class Thread_Pool : public ACE_Task<ACE_MT_SYNCH> @@ -136,7 +136,7 @@ int Thread_Pool::svc (void) { unsigned long t = ++this->total_activated_threads_; - if (DEBUG) // change this to 'true' for debugging + if (PRINT_DEBUG_MSGS) // change this to 'true' for debugging this->doprint_ = (t > 65530); if (this->doprint_) @@ -154,7 +154,7 @@ namespace { int Thread_Pool::open (void *) { - if (DEBUG) + if (PRINT_DEBUG_MSGS) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) pool start %d threads..."), this->n_threads_)); @@ -205,7 +205,7 @@ run_main (int, ACE_TCHAR *[]) if (thread_pool.wait () == -1) return 1; - if (DEBUG) + if (PRINT_DEBUG_MSGS) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%u total threads\n"), thread_pool.total_threads())); |