diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-19 13:34:46 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-19 13:34:46 +0000 |
| commit | 1cdc9e5f40436619458a6056c0d6e691140237dd (patch) | |
| tree | 686984beb08594fd6e8c084bcd3c922830447ae1 | |
| parent | c9555d2cc9a1fad4d2718f1331824d900c4e7dcb (diff) | |
| download | ATCD-1cdc9e5f40436619458a6056c0d6e691140237dd.tar.gz | |
ChangeLogTag: Fri Nov 19 07:33:33 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | examples/APG/Logging/Trace.h | 4 | ||||
| -rw-r--r-- | examples/APG/Logging/Trace_Return.cpp | 8 | ||||
| -rw-r--r-- | examples/APG/Logging/Wrap_Macros.cpp | 8 |
4 files changed, 23 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index a4beafa7737..7344ab89f2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Nov 19 07:33:33 2004 Chad Elliott <elliott_c@ociweb.com> + + * examples/APG/Logging/Trace.h: + * examples/APG/Logging/Trace_Return.cpp: + * examples/APG/Logging/Wrap_Macros.cpp: + + Fixed more VxWorks related build errors. Apparently, the g++ 2.96 + that comes with VxWorks can't handle ... in a macro parameter list + (however g++ 2.96 on linux can). + Fri Nov 19 06:55:32 2004 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/templates/bor.mpd: diff --git a/examples/APG/Logging/Trace.h b/examples/APG/Logging/Trace.h index f426b6a8adb..6e46741dba1 100644 --- a/examples/APG/Logging/Trace.h +++ b/examples/APG/Logging/Trace.h @@ -98,8 +98,10 @@ private: ////////////////////////////////////////////////// -#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) +#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) && \ + (!defined (VXWORKS) || !(__GNUC__ == 2 && __GNUC_MINOR__ == 96)) // This stuff only works with g++ 2.96 and later... +// But not with VxWorks g++ 2.96. // Listing 3 code/ch03 diff --git a/examples/APG/Logging/Trace_Return.cpp b/examples/APG/Logging/Trace_Return.cpp index 2aed470522b..4a7fd135169 100644 --- a/examples/APG/Logging/Trace_Return.cpp +++ b/examples/APG/Logging/Trace_Return.cpp @@ -1,11 +1,13 @@ // $Id$ -#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) +#include "Trace.h" + +#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) && \ + (!defined (VXWORKS) || !(__GNUC__ == 2 && __GNUC_MINOR__ == 96)) // The DEBUG stuff only works with g++ 2.96 and later. +// But not with VxWorks g++ 2.96. // Listing 1 code/ch03 -#include "Trace.h" - void foo (void); int ACE_TMAIN (int, ACE_TCHAR *[]) diff --git a/examples/APG/Logging/Wrap_Macros.cpp b/examples/APG/Logging/Wrap_Macros.cpp index 1de24754bcd..5474f2c5ae2 100644 --- a/examples/APG/Logging/Wrap_Macros.cpp +++ b/examples/APG/Logging/Wrap_Macros.cpp @@ -1,11 +1,13 @@ // $Id$ -#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) +#include "Trace.h" + +#if defined (__GNUC__) && (__GNUC__ >= 3 || __GNUC_MINOR__ > 95) && \ + (!defined (VXWORKS) || !(__GNUC__ == 2 && __GNUC_MINOR__ == 96)) // The macros in Trace.h only work on g++ 2.96 and later. +// But not with VxWorks g++ 2.96. // Listing 1 code/ch03 -#include "Trace.h" - void foo (void); int ACE_TMAIN (int, ACE_TCHAR *[]) |