summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrucedawson <brucedawson@chromium.org>2015-04-08 19:12:41 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-09 02:13:09 +0000
commit51428030f98124b4ec5d7c16d9b99e13970c2621 (patch)
tree4b6ffe157a1e27125967648952e682c16eeccfe9
parentb61a9fd6fe1a1a61733b0f08e9f1a209c557ec9d (diff)
downloadchromium_src-51428030f98124b4ec5d7c16d9b99e13970c2621.zip
chromium_src-51428030f98124b4ec5d7c16d9b99e13970c2621.tar.gz
chromium_src-51428030f98124b4ec5d7c16d9b99e13970c2621.tar.bz2
Fix illegal use of const in container contents to unbreak VS 2015.
For details see the STL Breaking Changes (VS14 CTP1) section of: http://blogs.msdn.com/b/vcblog/archive/2014/06/06/ c-14-stl-features-fixes-and-breaking-changes-in- visual-studio-14-ctp1.aspx In particular: "The Standard has always forbidden containers of const elements... ...elements must be Assignable, which const T isn't." Error message is: error C2338: The C++ Standard forbids containers of const elements because allocator<const T> is ill-formed. R=cpu@chromium.org BUG=440500 Review URL: https://codereview.chromium.org/1066213002 Cr-Commit-Position: refs/heads/master@{#324339}
-rw-r--r--sandbox/win/src/handle_closer.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sandbox/win/src/handle_closer.h b/sandbox/win/src/handle_closer.h
index 60473b3..fa65695 100644
--- a/sandbox/win/src/handle_closer.h
+++ b/sandbox/win/src/handle_closer.h
@@ -19,8 +19,7 @@ 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> >
- HandleMap;
+typedef std::map<const base::string16, std::set<base::string16> > HandleMap;
// Type and set of corresponding handle names to close.
struct HandleListEntry {