Bug 1119072, Part 6: Change a non-conforming usage of a const value type to a non-const value type, which VS2015 rightly rejects, r=bobowencode
authorBrian Smith <brian@briansmith.org>
Wed, 07 Jan 2015 23:28:51 -0800
changeset 251935 c827c112df81ecafd20226412ae40bb5a3106529
parent 251934 7b660d44d36aed19dba26886d21e18c152269fde
child 251936 ce3638e6a65942353a8c56dea78b6079b89bcec8
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)
reviewersbobowencode
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 6: Change a non-conforming usage of a const value type to a non-const value type, which VS2015 rightly rejects, r=bobowencode
security/sandbox/modifications-to-chromium-to-reapply-after-upstream-merge.txt
security/sandbox/win/src/handle_closer.h
--- 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,7 +1,8 @@
 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://hg.mozilla.org/mozilla-central/rev/d58c0218bb55
 https://bugzilla.mozilla.org/show_bug.cgi?id=1119072 (Part 3) vs2015-hashset-hashmap.patch
+https://bugzilla.mozilla.org/show_bug.cgi?id=1119072 (Part 6) vs2015-change-const-to-non-const-element.patch
--- a/security/sandbox/win/src/handle_closer.h
+++ b/security/sandbox/win/src/handle_closer.h
@@ -14,17 +14,17 @@
 #include "sandbox/win/src/sandbox_types.h"
 #include "sandbox/win/src/target_process.h"
 
 namespace sandbox {
 
 // This is a map of handle-types to names that we need to close in the
 // target process. A null set means we need to close all handles of the
 // given type.
-typedef std::map<const base::string16, std::set<const base::string16> >
+typedef std::map<const base::string16, std::set<base::string16> >
     HandleMap;
 
 // Type and set of corresponding handle names to close.
 struct HandleListEntry {
   size_t record_bytes;       // Rounded to sizeof(size_t) bytes.
   size_t offset_to_names;    // Nul terminated strings of name_count names.
   size_t name_count;
   base::char16 handle_type[1];