From 8965a51b2cbdec87c88e80dac34bde18b20f861c Mon Sep 17 00:00:00 2001 From: "mark@chromium.org" Date: Fri, 28 Jun 2013 22:54:18 +0000 Subject: Fix build on Android. Patch by Nico Weber Review URL: https://breakpad.appspot.com/609002/ git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1197 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/memory.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') 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 { }; 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 friend struct PageStdAllocator; + PageAllocator& allocator_; }; -- cgit v1.2.1