diff options
| author | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2013-06-28 22:54:18 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2013-06-28 22:54:18 +0000 |
| commit | 8965a51b2cbdec87c88e80dac34bde18b20f861c (patch) | |
| tree | 3753a0fd559e7819ff0253593020681e838e1614 /src | |
| parent | Fix a clang warning: (diff) | |
| download | breakpad-8965a51b2cbdec87c88e80dac34bde18b20f861c.tar.xz | |
Fix build on Android.
Patch by Nico Weber <thakis@chromium.org>
Review URL: https://breakpad.appspot.com/609002/
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1197 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/memory.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/memory.h b/src/common/memory.h index 8dc91520..5f944452 100644 --- a/src/common/memory.h +++ b/src/common/memory.h @@ -171,6 +171,11 @@ struct PageStdAllocator : public std::allocator<T> { }; private: + // Silly workaround for the gcc from Android's ndk (gcc 4.6), which will + // otherwise complain that `other.allocator_` is private in the constructor + // code. + template<typename Other> friend struct PageStdAllocator; + PageAllocator& allocator_; }; |