[go: nahoru, domu]

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
diff --git a/DEPS b/DEPS
index 2950227..05e0348 100644
--- a/DEPS
+++ b/DEPS
@@ -49,7 +49,7 @@
     "/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 @@
   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>