diff options
| -rw-r--r-- | ChangeLog-96b | 2 | ||||
| -rw-r--r-- | ace/config-win32-msvc2.0.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog-96b b/ChangeLog-96b index da0178ba00e..5e5cd8a5c2d 100644 --- a/ChangeLog-96b +++ b/ChangeLog-96b @@ -1,5 +1,7 @@ Wed Dec 4 00:27:07 1996 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> + * ace/config-win32-msvc*.0.h: Added NOMINMAX. + * ace/Registry: Removed NOMINMAX and VC_PLUS_PLUS_NESTED_CLASS_PROBLEM flags from the header file. The VC_PLUS_PLUS_NESTED_CLASS_PROBLEM flag is no longer needed diff --git a/ace/config-win32-msvc2.0.h b/ace/config-win32-msvc2.0.h index 54d44f141e6..65f599df148 100644 --- a/ace/config-win32-msvc2.0.h +++ b/ace/config-win32-msvc2.0.h @@ -7,6 +7,12 @@ #if !defined (ACE_CONFIG_H) #define ACE_CONFIG_H +// We are using STL's min and max (in algobase.h). Therefore the +// macros in window.h are extra +#if !defined NOMINMAX +#define NOMINMAX +#endif /* NOMINMAX */ + #if defined (_MSC_VER) // "C4355: 'this' : used in base member initializer list" #pragma warning(disable:4355) // disable C4514 warning |