diff options
| author | harrison <harrison@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-02-19 20:40:18 +0000 |
|---|---|---|
| committer | harrison <harrison@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-02-19 20:40:18 +0000 |
| commit | 5be0daa97b78a1edf14001dda1005abe90c5c0e3 (patch) | |
| tree | 2b7b088c384dc1d28d390ddf971c96cd86095cdd /STL | |
| parent | ccd5430ecba43e10d822fcd40bc7735560d8fac4 (diff) | |
| download | ATCD-5be0daa97b78a1edf14001dda1005abe90c5c0e3.tar.gz | |
Changed the defines for type bool. First, it's no longer defined for
WIN32. Also, I moved the defines out the namespace. I'm not sure if
that's the right thing to do.
Diffstat (limited to 'STL')
| -rw-r--r-- | STL/bool.h | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/STL/bool.h b/STL/bool.h index 6478add649a..76b9dbd69c3 100644 --- a/STL/bool.h +++ b/STL/bool.h @@ -1,5 +1,28 @@ -/* + +#if !defined (ACE_BOOL_H) +#define ACE_BOOL_H + +// Define bool out of the std namespace. +#if defined (WIN32) +#include <yvals.h> +#else +#if !defined (bool) +#define bool int +#endif /* bool */ + +#if !defined (true) +#define true 1 +#endif /* true */ + +#if !defined (false) +#define false 0 +#endif /* false */ + +#endif /* WIN32 */ + + + /* *Added by d:\\convert.pl --begin-- */ namespace std { @@ -23,18 +46,6 @@ namespace std { * */ -#if !defined (bool) -#define bool int -#endif /* bool */ - -#if !defined (true) -#define true 1 -#endif /* true */ - -#if !defined (false) -#define false 0 -#endif /* false */ - /* *Added by d:\\convert.pl --begin-- */ @@ -43,3 +54,4 @@ namespace std { *Added by d:\\convert.pl --end-- */ +#endif /* ACE_BOOL_H */ |