diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-07 15:10:50 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-07 15:10:50 +0000 |
| commit | 802d8dd670fde8b4a18b8e560bf18104197d15a1 (patch) | |
| tree | 1a4e13836fc4052b5d8a5ba1c47a2df91faf6801 /STL | |
| parent | b4eda7eb60f72f4b4d6a4693ce4ad7a48afe4ab2 (diff) | |
| download | ATCD-802d8dd670fde8b4a18b8e560bf18104197d15a1.tar.gz | |
oops, fixed so that bool is defined only with _MSC_VER
Diffstat (limited to 'STL')
| -rw-r--r-- | STL/bool.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/STL/bool.h b/STL/bool.h index c987b3f9e46..69f423caf95 100644 --- a/STL/bool.h +++ b/STL/bool.h @@ -3,22 +3,24 @@ K// $Id$ #if !defined (ACE_BOOL_H) #define ACE_BOOL_H +#if defined (_MSC_VER) // Define bool out of the std namespace. -#if defined (_MSC_VER) && _MSC_VER > 1010 -# include /**/ <yvals.h> -#else /* ! (_MSC_VER > 1010) */ -# 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 /* ! (_MSC_VER > 1010) */ +# if _MSC_VER > 1010 +# include /**/ <yvals.h> +# else /* _MSC_VER <= 1010 */ +# 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 /* _MSC_VER <= 1010 */ +#endif /* _MSC_VER */ /* |