aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/memory.h5
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_;
};