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/extension_set_unittest.cc | |
| parent | faf581d20866ad5e586b3e515f6c547d2dcec2c1 (diff) | |
Down-integrate from internal code base (C++ maps support).
Diffstat (limited to 'src/google/protobuf/extension_set_unittest.cc')
| -rw-r--r-- | src/google/protobuf/extension_set_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/extension_set_unittest.cc b/src/google/protobuf/extension_set_unittest.cc index b9d07353..684ce002 100644 --- a/src/google/protobuf/extension_set_unittest.cc +++ b/src/google/protobuf/extension_set_unittest.cc @@ -375,7 +375,7 @@ TEST(ExtensionSetTest, ArenaSetAllocatedMessageAndRelease) { TEST(ExtensionSetTest, SwapExtensionBothFullWithArena) { ::google::protobuf::Arena arena1; - scoped_ptr<google::protobuf::Arena> arena2(new ::google::protobuf::Arena()); + google::protobuf::scoped_ptr<google::protobuf::Arena> arena2(new ::google::protobuf::Arena()); unittest::TestAllExtensions* message1 = Arena::CreateMessage<unittest::TestAllExtensions>(&arena1); |