diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-29 01:21:23 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-29 01:21:23 +0000 |
| commit | 18e07fd1a67b03a1bdbca3695f181ab70266d4ba (patch) | |
| tree | 40047991201decb35eb3ccb3f7a7e0e4ffdfaeea | |
| parent | 22d30a7e29efaecfc6df42cb91edcbfe69627e7b (diff) | |
| download | chromium_src-18e07fd1a67b03a1bdbca3695f181ab70266d4ba.zip chromium_src-18e07fd1a67b03a1bdbca3695f181ab70266d4ba.tar.gz chromium_src-18e07fd1a67b03a1bdbca3695f181ab70266d4ba.tar.bz2 | |
Pulling in new icu with msvs2010 fix.
Cloned http://codereview.chromium.org/6767003/ to land in the same CL.
BUG=None
TEST=None
R=jeanluc@chromium.org
Review URL: http://codereview.chromium.org/6698070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79646 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | courgette/memory_allocator.h | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -49,7 +49,7 @@ deps = { "/trunk/deps/third_party/WebKit@76115", "src/third_party/icu": - "/trunk/deps/third_party/icu46@78292", + "/trunk/deps/third_party/icu46@79636", "src/third_party/hunspell": "/trunk/deps/third_party/hunspell@65351", diff --git a/courgette/memory_allocator.h b/courgette/memory_allocator.h index 0b2f376..4774b88 100644 --- a/courgette/memory_allocator.h +++ b/courgette/memory_allocator.h @@ -181,7 +181,9 @@ class MemoryAllocator { MemoryAllocator() _THROW0() { } - explicit MemoryAllocator(const MemoryAllocator<T>& other) _THROW0() { + // We can't use an explicit constructor here, as dictated by our style guide. + // The implementation of basic_string in Visual Studio 2010 prevents this. + MemoryAllocator(const MemoryAllocator<T>& other) _THROW0() { } template<class OtherT> |