From e8e3a5bf96f2ae1b0d88037a3ecb7f89e6b7ac7d Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 17 Nov 2014 11:20:19 -0500 Subject: [PATCH 1/5] Compat w/ git < 1.8. --- .gitignore | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 471d4fc8..13cc24ab 100644 --- a/.gitignore +++ b/.gitignore @@ -30,19 +30,19 @@ config.status libtool protobuf-lite.pc protobuf.pc -**/.deps +.deps stamp-h1 # in-tree build products -**/*.o -**/*.lo -**/*.la +*.o +*.lo +*.la src/.libs -**/.dirstamp +.dirstamp -**/unittest*.pb.* -**/cpp_test*.pb.* +unittest*.pb.* +cpp_test*.pb.* src/protoc src/unittest_proto_middleman From 706690bddbf2009f05de134134d1a585d76e61b8 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 17 Nov 2014 11:22:59 -0500 Subject: [PATCH 2/5] Ignore generated test scaffolding files. --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 13cc24ab..0837cde8 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,8 @@ cpp_test*.pb.* src/protoc src/unittest_proto_middleman +# Generated test scaffolding +src/protobuf*-test +src/test_plugin +src/testzip.* +src/zcg*zip From 38a3dd502d44d2b7ae3f5a8a76e6b954b340ed3b Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 17 Nov 2014 16:17:33 -0500 Subject: [PATCH 3/5] Exclude Python build artifacts. --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 0837cde8..2507579a 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,13 @@ src/.libs unittest*.pb.* cpp_test*.pb.* +*.pyc +*.egg-info +*_pb2.py +python/.eggs/ +python/build/ +python/google/protobuf/compiler/ + src/protoc src/unittest_proto_middleman From 0fab06062f3be27a061e2062e113083ecefa5146 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 18 Nov 2014 11:37:37 -0500 Subject: [PATCH 4/5] Fix 'error: a class-key must be used when declaring a friend' compile error. --- src/google/protobuf/map.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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::iterator it_; - friend Map; + friend class Map; }; // google::protobuf::Map is an associative container type used to store protobuf map From 4113685cdd58f7a0357104083a49c42a8e65af71 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Tue, 18 Nov 2014 11:58:21 -0500 Subject: [PATCH 5/5] Fix testcase compile failure under gcc 4.6: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit google/protobuf/map_test.cc:88:16: error: expected ‘;’ at end of member declaration google/protobuf/map_test.cc:88:18: error: ‘override’ does not name a type . --- src/google/protobuf/map_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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());