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"

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

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());