organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Remove a friend-class template that is only used for the

Browse source 
constructor, and instead create an _internal_only getter
that gets the needed information. This is a workaround for
a deficiency in gcc-4.4 that does not properly support
templated friend classes.
This commit is contained in:
Vijay Pai 2016-06-15 20:42:30 -07:00
parent 52598c646e
commit 37eaae2006
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/google/protobuf/map.h
View file

@ -587,7 +587,7 @@ class Map {
explicit MapAllocator(Arena* arena) : arena_(arena) {}
template <typename X>
MapAllocator(const MapAllocator<X>& allocator)
: arena_(allocator.arena_) {}
: arena_(allocator.arena_internal_only()) {}
pointer allocate(size_type n, const_pointer hint = 0) {
// If arena is not given, malloc needs to be called which doesn't
@ -650,12 +650,15 @@ class Map {
return std::numeric_limits<size_type>::max();
}
// To support gcc-4.4, which does not properly
// support templated friend classes
Arena* arena_internal_only() const {
return arena_;
}
private:
typedef void DestructorSkippable_;
Arena* const arena_;
template <typename X>
friend class MapAllocator;
};
// InnerMap's key type is Key and its value type is value_type*. We use a