Bug 1119072, Part 3(b): Silence warning about deprecated use of hash_set and hash_map in security/sandbox, r=jld
authorBrian Smith <brian@briansmith.org>
Mon, 12 Jan 2015 19:58:43 -0800
changeset 251933 e139be9249f29322f65210a42bfa567010373110
parent 251932 fbdd48b8513c39c769d7dcb36d5bc4a0dab31572
child 251934 7b660d44d36aed19dba26886d21e18c152269fde
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjld
bugs1119072
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1119072, Part 3(b): Silence warning about deprecated use of hash_set and hash_map in security/sandbox, r=jld
security/sandbox/chromium/base/containers/hash_tables.h
security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
--- a/security/sandbox/chromium/base/containers/hash_tables.h
+++ b/security/sandbox/chromium/base/containers/hash_tables.h
@@ -23,18 +23,22 @@
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 
 #if defined(COMPILER_MSVC)
+
+#pragma push_macro("_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS")
+#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
 #include <hash_map>
 #include <hash_set>
+#pragma pop_macro("_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS")
 
 #define BASE_HASH_NAMESPACE stdext
 
 #elif defined(COMPILER_GCC)
 #if defined(OS_ANDROID)
 #define BASE_HASH_NAMESPACE std
 #else
 #define BASE_HASH_NAMESPACE __gnu_cxx
--- a/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
+++ b/security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
@@ -1,6 +1,7 @@
 Please add a link to the bugzilla bug and patch name that should be re-applied.
 Also, please update any existing links to their actual mozilla-central changeset.
 
 https://hg.mozilla.org/mozilla-central/rev/365d1073111a
 https://hg.mozilla.org/mozilla-central/rev/0f763c186855
-https://bugzilla.mozilla.org/show_bug.cgi?id=1105729 bug1105729.patch
+https://hg.mozilla.org/mozilla-central/rev/d58c0218bb55
+https://bugzilla.mozilla.org/show_bug.cgi?id=1119072 (Part 3) vs2015-hashset-hashmap.patch