Fri Nov 14 15:03:21 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>

        * bin/MakeProjectCreator/config/vc14nmake.mpb:
          Disable warnings 4456, 4458, and 4459 with Visual Studio 2015
          when we are using nmake

2 files changed, 24 insertions, 1 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 3b25fad0493..814753b17f4 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 14 15:03:21 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/vc14nmake.mpb:
+          Disable warnings 4456, 4458, and 4459 with Visual Studio 2015
+          when we are using nmake
+
 Fri Nov 14 08:14:39 UTC 2014  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * NEWS:
diff --git a/ACE/bin/MakeProjectCreator/config/vc14nmake.mpb b/ACE/bin/MakeProjectCreator/config/vc14nmake.mpb
index 3e1cd845bde..425a4575f2a 100644
--- a/ACE/bin/MakeProjectCreator/config/vc14nmake.mpb
+++ b/ACE/bin/MakeProjectCreator/config/vc14nmake.mpb
@@ -1,9 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project {
+feature (nmake_avoid_Wp64) {
   specific(nmake) {
     addcompile -= /Wp64
   }
 }
 
+feature(vc_avoid_hides_local_declaration) {
+  specific(nmake) {
+    DisableSpecificWarnings += 4456
+  }
+}
+
+feature(vc_avoid_hides_global_declaration) {
+  specific(nmake) {
+    DisableSpecificWarnings += 4459
+  }
+}
+
+feature(vc_avoid_hides_class_member) {
+  specific(nmake) {
+    DisableSpecificWarnings += 4458
+  }
+}