diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-08 13:48:53 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-08 13:48:53 +0000 |
| commit | 68fbd9f48d647b4f55655ad38df55a6e9eed062e (patch) | |
| tree | 8b6d7c4e3689ce230fd724abd63759cd1bb80038 | |
| parent | e777b843e0a73331d71eb14d0749ade7cd7969b8 (diff) | |
| download | ATCD-68fbd9f48d647b4f55655ad38df55a6e9eed062e.tar.gz | |
ChangeLogTag: Mon Jan 8 13:48:17 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/examples/APG/Logging/Trace.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 4a3ff561b35..ab273050e8c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 8 13:48:17 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * examples/APG/Logging/Trace.h: + + Undefine TRACE before defining it to avoid warnings from vc71. + Mon Jan 8 12:41:30 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/TP_Reactor.cpp: diff --git a/ACE/examples/APG/Logging/Trace.h b/ACE/examples/APG/Logging/Trace.h index 9c71bad13e3..782a610558e 100644 --- a/ACE/examples/APG/Logging/Trace.h +++ b/ACE/examples/APG/Logging/Trace.h @@ -77,6 +77,10 @@ private: // Listing 2 code/ch03 #define TRACE_PREFIX ACE_TEXT ("TRACE ") +#if defined (TRACE) +#undef TRACE +#endif /* TRACE */ + #if (ACE_NTRACE == 1) # define TRACE(X) # define TRACE_RETURN(V) return V; |