diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-18 15:02:09 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-18 15:02:09 -0800 |
commit | db90dff872260d9cbb41113ce28b25a9248926d3 (patch) | |
tree | 5482d7e61cd017b64d6ce7e9bee4131dd4955a0f | |
parent | e4f063f2638a26b7abfd01fe3a4117efb3d753c0 (diff) | |
parent | 4113685cdd58f7a0357104083a49c42a8e65af71 (diff) | |
download | protobuf-db90dff872260d9cbb41113ce28b25a9248926d3.tar.gz protobuf-db90dff872260d9cbb41113ce28b25a9248926d3.tar.bz2 protobuf-db90dff872260d9cbb41113ce28b25a9248926d3.zip |
Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friend
Fix compiler error: "a class-key must be used when declaring a friend"
-rw-r--r-- | src/google/protobuf/map.h | 2 | ||||
-rw-r--r-- | src/google/protobuf/map_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/map.h b/src/google/protobuf/map.h index f99c5a73..a9937b9b 100644 --- a/src/google/protobuf/map.h +++ b/src/google/protobuf/map.h @@ -119,7 +119,7 @@ class MapIterator { private: typename hash_map<Key, value_type*>::iterator it_; - friend Map<Key, T>; + friend class Map<Key, T>; }; // google::protobuf::Map is an associative container type used to store protobuf map diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc index 9d4016d3..f3583a83 100644 --- a/src/google/protobuf/map_test.cc +++ b/src/google/protobuf/map_test.cc @@ -85,7 +85,7 @@ class MapImplTest : public ::testing::Test { EXPECT_TRUE(map_.empty()); EXPECT_EQ(0, map_.size()); } - ~MapImplTest() override {} + ~MapImplTest() {} void ExpectSingleElement(int32 key, int32 value) { EXPECT_FALSE(map_.empty()); |