aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvjpai <vpai@google.com>2016-06-16 15:43:23 -0700
committervjpai <vpai@google.com>2016-06-16 15:43:23 -0700
commit6daf3d2c4ae612e46c17df693ea9b0ea04c1f079 (patch)
tree8176b0139a9acc5d5f5f23651d299de108b3a719
parent37eaae20069cd356d80d034b05eddb234cb21194 (diff)
downloadprotobuf-6daf3d2c4ae612e46c17df693ea9b0ea04c1f079.tar.gz
protobuf-6daf3d2c4ae612e46c17df693ea9b0ea04c1f079.tar.bz2
protobuf-6daf3d2c4ae612e46c17df693ea9b0ea04c1f079.zip
Address review comments on function name
-rw-r--r--src/google/protobuf/map.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h
index 7f4acd0d..31593c1a 100644
--- a/src/google/protobuf/map.h
+++ b/src/google/protobuf/map.h
@@ -587,7 +587,7 @@ class Map {
explicit MapAllocator(Arena* arena) : arena_(arena) {}
template <typename X>
MapAllocator(const MapAllocator<X>& allocator)
- : arena_(allocator.arena_internal_only()) {}
+ : arena_(allocator.arena()) {}
pointer allocate(size_type n, const_pointer hint = 0) {
// If arena is not given, malloc needs to be called which doesn't
@@ -652,7 +652,7 @@ class Map {
// To support gcc-4.4, which does not properly
// support templated friend classes
- Arena* arena_internal_only() const {
+ Arena* arena() const {
return arena_;
}