AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #742 from xfxyjwf/c11_compile

Browse Source 
Fix compile issues with -std=c++11
This commit is contained in:
Feng Xiao 2015-08-25 22:35:24 -07:00
commit c80f7c6f3c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/google/protobuf/map_test.cc
View File

@ -2188,7 +2188,7 @@ TEST_F(MapFieldInDynamicMessageTest, MapSpaceUsed) {
TEST_F(MapFieldInDynamicMessageTest, RecursiveMap) {
TestRecursiveMapMessage from;
(*from.mutable_a())[0];
(*from.mutable_a())[""];
string data = from.SerializeAsString();
google::protobuf::scoped_ptr<Message> to(
factory_.GetPrototype(recursive_map_descriptor_)->New());

4
src/google/protobuf/map_unittest.proto
View File

@ -116,7 +116,7 @@ message MessageContainingEnumCalledType {
enum Type {
TYPE_FOO = 0;
}
map<int32, MessageContainingEnumCalledType> type = 1;
map<string, MessageContainingEnumCalledType> type = 1;
}
// Previously, message cannot contain map field called "entry".
@ -125,5 +125,5 @@ message MessageContainingMapCalledEntry {
}
message TestRecursiveMapMessage {
map<int32, TestRecursiveMapMessage> a = 1;
map<string, TestRecursiveMapMessage> a = 1;
}