diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-11-14 11:50:31 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-14 11:50:31 -0800 |
| commit | f157a5651c79a7a36e242af216a5d5b383ba8af2 (patch) | |
| tree | 368bb0ca0e89ab7514302e4df00435a4ef461a28 /src/google/protobuf/repeated_field_reflection_unittest.cc | |
| parent | faf581d20866ad5e586b3e515f6c547d2dcec2c1 (diff) | |
Down-integrate from internal code base (C++ maps support).
Diffstat (limited to 'src/google/protobuf/repeated_field_reflection_unittest.cc')
| -rw-r--r-- | src/google/protobuf/repeated_field_reflection_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/repeated_field_reflection_unittest.cc b/src/google/protobuf/repeated_field_reflection_unittest.cc index 98c864d3..ae43dfab 100644 --- a/src/google/protobuf/repeated_field_reflection_unittest.cc +++ b/src/google/protobuf/repeated_field_reflection_unittest.cc @@ -686,7 +686,7 @@ TEST(RepeatedFieldReflectionTest, RepeatedFieldRefDynamicMessage) { desc->FindFieldByName("repeated_int32"); DynamicMessageFactory factory; - scoped_ptr<Message> dynamic_message(factory.GetPrototype(desc)->New()); + google::protobuf::scoped_ptr<Message> dynamic_message(factory.GetPrototype(desc)->New()); const Reflection* refl = dynamic_message->GetReflection(); MutableRepeatedFieldRef<int32> rf_int32 = |