From 802d8dd670fde8b4a18b8e560bf18104197d15a1 Mon Sep 17 00:00:00 2001 From: levine Date: Sun, 7 Jun 1998 15:10:50 +0000 Subject: oops, fixed so that bool is defined only with _MSC_VER --- STL/bool.h | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'STL') 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 /**/ -#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 /**/ +# 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 */ /* -- cgit v1.2.1