ChangeLogTag:Tue Mar 13 12:13:37 UTC 2007 Steve Huston <shuston@riverace.com>

2 files changed, 15 insertions, 2 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 20252233244..423be762d1a 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Tue Mar 13 12:13:37 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * bin/MakeProjectCreator/config/vc8_warnings.mpb: For the
+          vc8_avoid_crt_secure_warnings feature, add /wd4996 to the nmake
+          case since it seems to not pay attention to _CRT_NONSTDC_NO_WARNINGS.
+          Also, reversed the default for VC8 SCL secure warnings - they're on
+          by default since Ossama implemented the checked STL iterator stuff.
+
 Tue Mar 13 09:57:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/tao_orb_tests.lst:
diff --git a/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb b/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb
index a7dcbae3948..f416d0973ab 100644
--- a/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb
+++ b/ACE/bin/MakeProjectCreator/config/vc8_warnings.mpb
@@ -8,16 +8,21 @@
 // warnings are disabled by default. To enable them, generate your projects
 // with the feature set to 0.
 
+
 feature(vc8_avoid_crt_secure_warnings) {
   specific(vc8) {
     macros += _CRT_SECURE_NO_WARNINGS
   }
+
+  // VC8 builds via nmake don't respect _CRT_NONSTDC_NO_WARNINGS that the
+  // IDE build does so disable it with /wd4996. It's a very large hammer,
+  // but nmake seems to leave little choice.
   specific(nmake) {
-    compile_flags += /D _CRT_NONSTDC_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
+    compile_flags += /wd4996 /D _CRT_SECURE_NO_DEPRECATE
   }
 }
 
-feature(vc8_avoid_scl_secure_warnings) {
+feature(!vc8_scl_secure_warnings) {
   specific(vc8) {
     macros += _SCL_SECURE_NO_WARNINGS
   }