Disable wxUSE_STD_CONTAINERS by default for MSVC6.

This compiler can't compile its own standard headers with the default options
as it overflows an internal heap. Disable the use of standard containers by
default for it to avoid this problem and indicate that /Zm option must be used
to avoid this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 6b52b4b514037eedf1ee6d563c1cda4f22767b9a..4f0758aa59b72a15538fbc8afa9e139f16280f25 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -303,11 +303,20 @@
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //

-// Default is 1 if compiler supports it.
+// Default is 1 if compiler supports it. Currently this means not one of the
+// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it
+// needs non-default options for such build to avoid getting "fatal error
+// C1076: compiler limit : internal heap limit reached; use /Zm to specify a
+// higher limit" in its own standard headers, so you need to ensure you do
+// increase the heap size before enabling this option for this compiler.

 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.
 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.

-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif

 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index f5235f7a2aae7f2ae5974830667cd71748f4c0cc..1f640b4861d4ee5fd9f0458b2aae08308775888a 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -303,11 +303,20 @@
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //

-// Default is 1 if compiler supports it.
+// Default is 1 if compiler supports it. Currently this means not one of the
+// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it
+// needs non-default options for such build to avoid getting "fatal error
+// C1076: compiler limit : internal heap limit reached; use /Zm to specify a
+// higher limit" in its own standard headers, so you need to ensure you do
+// increase the heap size before enabling this option for this compiler.

 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.
 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.

-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif

 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index ed6bcacb99e6dbc760113cf70a0f8610ebfac4c9..372b9727c531e1cd9d78bbb0ec14fc423f77f12a 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -303,11 +303,20 @@
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //

-// Default is 1 if compiler supports it.
+// Default is 1 if compiler supports it. Currently this means not one of the
+// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it
+// needs non-default options for such build to avoid getting "fatal error
+// C1076: compiler limit : internal heap limit reached; use /Zm to specify a
+// higher limit" in its own standard headers, so you need to ensure you do
+// increase the heap size before enabling this option for this compiler.

 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.
 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.

-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif

 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index b0017a8b3792dc9e58f22dc054685c5bacfbc4a5..9312b3ecd574df3fa874d72c731a6d546ebf5922 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -303,11 +303,20 @@
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //

-// Default is 1 if compiler supports it.
+// Default is 1 if compiler supports it. Currently this means not one of the
+// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it
+// needs non-default options for such build to avoid getting "fatal error
+// C1076: compiler limit : internal heap limit reached; use /Zm to specify a
+// higher limit" in its own standard headers, so you need to ensure you do
+// increase the heap size before enabling this option for this compiler.

 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.
 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.

-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif

 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the

diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 8025882c714988b3fb92b014a550e6beab8d67cc..28d9a18a1dade698060c425b4e432b680782f3da 100644 (file)
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -304,11 +304,20 @@
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //

-// Default is 1 if compiler supports it.
+// Default is 1 if compiler supports it. Currently this means not one of the
+// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it
+// needs non-default options for such build to avoid getting "fatal error
+// C1076: compiler limit : internal heap limit reached; use /Zm to specify a
+// higher limit" in its own standard headers, so you need to ensure you do
+// increase the heap size before enabling this option for this compiler.

 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.
 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.

-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif

 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index d143dbfce1619c4f639ed9ccfb50d54676fa6acb..de8d5c7998a883d44f7dca88c81151d216568a61 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -303,11 +303,20 @@
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //

-// Default is 1 if compiler supports it.
+// Default is 1 if compiler supports it. Currently this means not one of the
+// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it
+// needs non-default options for such build to avoid getting "fatal error
+// C1076: compiler limit : internal heap limit reached; use /Zm to specify a
+// higher limit" in its own standard headers, so you need to ensure you do
+// increase the heap size before enabling this option for this compiler.

 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.
 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.

-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif

 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index fa24104f117d75dd827d4006be1df04f4ee53907..bcf7254b4f748278f58add1aa68bef095254023d 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -299,11 +299,20 @@
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //

-// Default is 1 if compiler supports it.
+// Default is 1 if compiler supports it. Currently this means not one of the
+// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it
+// needs non-default options for such build to avoid getting "fatal error
+// C1076: compiler limit : internal heap limit reached; use /Zm to specify a
+// higher limit" in its own standard headers, so you need to ensure you do
+// increase the heap size before enabling this option for this compiler.

 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.
 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.

-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif

 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 4e1cd85bec466e95f5e98fbc0a1b49d9ef135969..0acafc89fa498c792be32d7167aa25a64577f3b3 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -302,11 +302,20 @@
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //
 // usually more limited) implementations are used which allows to avoid the
 // dependency on the C++ run-time library.
 //

-// Default is 1 if compiler supports it.
+// Default is 1 if compiler supports it. Currently this means not one of the
+// compilers mentioned in wxUSE_STD_DEFAULT comment and also not VC6 as it
+// needs non-default options for such build to avoid getting "fatal error
+// C1076: compiler limit : internal heap limit reached; use /Zm to specify a
+// higher limit" in its own standard headers, so you need to ensure you do
+// increase the heap size before enabling this option for this compiler.

 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.
 //
 // Recommended setting: 1 unless you use a system without good implementation
 // of STL.

-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif

 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
 
 // Use standard C++ streams if 1 instead of wx streams in some places. If
 // disabled, wx streams are used everywhere and wxWidgets doesn't depend on the

diff --git a/setup.h.in b/setup.h.in
index 76e8e8d0c90e140f0b658def5c252bf003b84d8b..fe2e031afbfe266ee60de2f9e08aa50a93d1585e 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -216,7 +216,11 @@
     #define wxUSE_STD_DEFAULT  0
 #endif
 
     #define wxUSE_STD_DEFAULT  0
 #endif
 

-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#if defined(_MSC_VER) && _MSC_VER < 1300
+    #define wxUSE_STD_CONTAINERS 0
+#else
+    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#endif

 
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
 
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT