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/text_format.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/google/protobuf/text_format.h')

diff --git a/src/google/protobuf/text_format.h b/src/google/protobuf/text_format.h
index 548962cb..44d68cab 100644
--- a/src/google/protobuf/text_format.h
+++ b/src/google/protobuf/text_format.h
@@ -271,7 +271,7 @@ class LIBPROTOBUF_EXPORT TextFormat {
 
     bool print_message_fields_in_index_order_;
 
-    scoped_ptr<const FieldValuePrinter> default_field_value_printer_;
+    google::protobuf::scoped_ptr<const FieldValuePrinter> default_field_value_printer_;
     typedef map<const FieldDescriptor*,
                 const FieldValuePrinter*> CustomPrinterMap;
     CustomPrinterMap custom_printers_;
-- 
cgit v1.2.3