diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-07 09:56:39 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-07 09:56:39 +0000 |
| commit | 872e8233134d446487509ec57f0c6979e59f6226 (patch) | |
| tree | cefeba6f3bf3fb73158972aa7fb1b04d93a2f220 | |
| parent | dfb17b67ed97951a70e5c5a3c8a2fd1578212edf (diff) | |
| download | ATCD-872e8233134d446487509ec57f0c6979e59f6226.tar.gz | |
Tue Nov 7 09:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/performance-tests/Misc/basic_func.cpp | 2 | ||||
| -rw-r--r-- | ACE/performance-tests/Misc/basic_func.h | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 53daac48966..6985a856c30 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 7 09:56:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * performance-tests/Misc/basic_func.{h,cpp}: + Renamed B to BB to resolve compile problems on rtems where we + have also a typedef B + Tue Nov 7 07:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/ACE.h: diff --git a/ACE/performance-tests/Misc/basic_func.cpp b/ACE/performance-tests/Misc/basic_func.cpp index 84943e0b22a..a76565d74fb 100644 --- a/ACE/performance-tests/Misc/basic_func.cpp +++ b/ACE/performance-tests/Misc/basic_func.cpp @@ -4,7 +4,7 @@ ACE_RCSID(Misc, basic_func, "$Id$") -int A, B, C, D, E, F; +int A, BB, C, D, E, F; void func () diff --git a/ACE/performance-tests/Misc/basic_func.h b/ACE/performance-tests/Misc/basic_func.h index dcb70bae5da..bbaf4d4cfb9 100644 --- a/ACE/performance-tests/Misc/basic_func.h +++ b/ACE/performance-tests/Misc/basic_func.h @@ -25,7 +25,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -extern int A,B,C,D,E,F; +extern int A,BB,C,D,E,F; // If your compiler optimizes away Empty_Iteration_Test::run (), then // #defining ACE_HAS_OPTIMIZED_NULL_FUNCTIONS may help produce more @@ -36,8 +36,8 @@ extern int A,B,C,D,E,F; #endif /* _MSC_VER */ #if defined (ACE_HAS_OPTIMIZED_NULL_FUNCTIONS) -# define EXPR(R,A,B,C,D) (R=(A*B + C*D)) -# define DO_SOMETHING EXPR(A,B,EXPR(F,A,E,C,B),EXPR(B,F,A,D,E),EXPR(E,B,F,A,C)); +# define EXPR(R,A,BB,C,D) (R=(A*BB + C*D)) +# define DO_SOMETHING EXPR(A,BB,EXPR(F,A,E,C,BB),EXPR(BB,F,A,D,E),EXPR(E,BB,F,A,C)); #else /* ACE_HAS_OPTIMIZED_NULL_FUNCTIONS */ # define DO_SOMETHING #endif /* ACE_HAS_OPTIMIZED_NULL_FUNCTIONS */ |