diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-25 22:20:47 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-25 22:20:47 -0700 |
commit | d9ab86cdbf87915319020241de65b821be068db7 (patch) | |
tree | ff19acb4736b324c8e6a244e351cacede909cba5 /src/google | |
parent | b192ba87f72b5e3e8add09bbcbb7623831e3079b (diff) | |
download | protobuf-d9ab86cdbf87915319020241de65b821be068db7.tar.gz protobuf-d9ab86cdbf87915319020241de65b821be068db7.tar.bz2 protobuf-d9ab86cdbf87915319020241de65b821be068db7.zip |
Fix compile issues with -std=c++11
This compiles with -std=c++11:
message Foo {
map<string, Foo> value = 1;
}
This does not compile:
message Foo {
map<int32, Foo> value = 1;
}
Needs to dig more into the underlying issue.
Diffstat (limited to 'src/google')
-rw-r--r-- | src/google/protobuf/map_test.cc | 2 | ||||
-rw-r--r-- | src/google/protobuf/map_unittest.proto | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc index a74801d9..16a24c25 100644 --- a/src/google/protobuf/map_test.cc +++ b/src/google/protobuf/map_test.cc @@ -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()); diff --git a/src/google/protobuf/map_unittest.proto b/src/google/protobuf/map_unittest.proto index d3b525a0..aea1e8ce 100644 --- a/src/google/protobuf/map_unittest.proto +++ b/src/google/protobuf/map_unittest.proto @@ -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; } |