summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Szorc <gps@mozilla.com>2016-03-14 23:57:33 -0700
committerGregory Szorc <gps@mozilla.com>2016-03-14 23:57:33 -0700
commit8e09eaf5dfbe4099e60014dd91683fd379b79fd3 (patch)
treef91f221f938a5687ecdb96c45ed31458783c717f
parent5ae80c6278e6440e2f6bd917946c5d773926d7d2 (diff)
downloadnss-hg-8e09eaf5dfbe4099e60014dd91683fd379b79fd3.tar.gz
Bug 1256484 - Disable C4456 and C4458 to unblock compilation on VS2015; r=keeler
As part of unblocking building with VS2015u1 in automation, I'm mass disabling compiler warnings that are turned into errors. This is not the preferred mechanism to fix compilation warnings. So hopefully someone fixes the underlying problem someday. However, there are tons of ignored warnings in security/certverifier, so I guess the workaround in this patch is par for the course. MozReview-Commit-ID: 7GZ9RpkxnwT
-rw-r--r--lib/mozpkix/moz.build5
-rw-r--r--lib/mozpkix/test/gtest/moz.build4
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/mozpkix/moz.build b/lib/mozpkix/moz.build
index 14f14a1a6..04b5a7504 100644
--- a/lib/mozpkix/moz.build
+++ b/lib/mozpkix/moz.build
@@ -31,3 +31,8 @@ include('warnings.mozbuild')
Library('mozillapkix')
FINAL_LIBRARY = 'xul'
+
+if CONFIG['_MSC_VER']:
+ # This is intended as a temporary hack to support building with VS2015.
+ # declaration of '*' hides class member
+ CXXFLAGS += ['-wd4458'] \ No newline at end of file
diff --git a/lib/mozpkix/test/gtest/moz.build b/lib/mozpkix/test/gtest/moz.build
index addc19301..efb5aa145 100644
--- a/lib/mozpkix/test/gtest/moz.build
+++ b/lib/mozpkix/test/gtest/moz.build
@@ -54,4 +54,8 @@ elif CONFIG['_MSC_VER']:
'-wd4625', # copy constructor could not be generated.
'-wd4626', # assugment operator could not be generated.
'-wd4640', # construction of local static object is not thread safe.
+
+ # This is intended as a temporary hack to support building with VS2015.
+ # declaration of '*' hides class member
+ '-wd4458',
]