diff options
| -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> |