summaryrefslogtreecommitdiff
path: root/ace/Registry.h
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1996-12-01 06:30:13 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1996-12-01 06:30:13 +0000
commitbf5009e6b5da75bb64d06bc3e60b1cfbeebee0a9 (patch)
tree741fdd52a7d38fe9decacbbb20a2d2f3e79ad5fe /ace/Registry.h
parentcd136206c84738a63c0f67e29eb3856c7798c29b (diff)
downloadATCD-bf5009e6b5da75bb64d06bc3e60b1cfbeebee0a9.tar.gz
*** empty log message ***
Diffstat (limited to 'ace/Registry.h')
-rw-r--r--ace/Registry.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/ace/Registry.h b/ace/Registry.h
index 890aec1f37f..c7ff05a7bec 100644
--- a/ace/Registry.h
+++ b/ace/Registry.h
@@ -17,11 +17,20 @@
#if !defined (ACE_REGISTRY_H)
#define ACE_REGISTRY_H
+#if !defined (NOMINMAX)
+#define NOMINMAX
+#define ACE_TURN_NOMINMAX_OFF
+#endif
+
#include "ace/OS.h"
#if defined (ACE_WIN32)
// This only works on Win32 platforms
+#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM)
+#define VC_PLUS_PLUS_NESTED_CLASS_PROBLEM
+#endif
+
#include "vector.h"
#include "bstring.h"
// You must configure the STL components in order to use this wrapper.
@@ -503,5 +512,10 @@ private:
};
+#if defined (ACE_TURN_NOMINMAX_OFF)
+#undef NOMINMAX
+#undef ACE_TURN_NOMINMAX_OFF
+#endif
+
#endif /* ACE_WIN32 */
#endif /* ACE_REGISTRY_H */