From f157a5651c79a7a36e242af216a5d5b383ba8af2 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Fri, 14 Nov 2014 11:50:31 -0800
Subject: Down-integrate from internal code base (C++ maps support).

---
 src/google/protobuf/preserve_unknown_enum_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/google/protobuf/preserve_unknown_enum_test.cc')

diff --git a/src/google/protobuf/preserve_unknown_enum_test.cc b/src/google/protobuf/preserve_unknown_enum_test.cc
index e988a5cb..33e9ea10 100644
--- a/src/google/protobuf/preserve_unknown_enum_test.cc
+++ b/src/google/protobuf/preserve_unknown_enum_test.cc
@@ -110,7 +110,7 @@ TEST(PreserveUnknownEnumTest, PreserveParseAndSerializeDynamicMessage) {
   string serialized = orig_message.SerializeAsString();
 
   google::protobuf::DynamicMessageFactory factory;
-  scoped_ptr<google::protobuf::Message> message(factory.GetPrototype(
+  google::protobuf::scoped_ptr<google::protobuf::Message> message(factory.GetPrototype(
       proto2_preserve_unknown_enum_unittest::MyMessage::descriptor())->New());
   EXPECT_EQ(true, message->ParseFromString(serialized));
   message->DiscardUnknownFields();
-- 
cgit v1.2.3