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/text_format.h | |
| parent | faf581d20866ad5e586b3e515f6c547d2dcec2c1 (diff) | |
| download | protobuf-f157a5651c79a7a36e242af216a5d5b383ba8af2.tar.gz protobuf-f157a5651c79a7a36e242af216a5d5b383ba8af2.tar.bz2 protobuf-f157a5651c79a7a36e242af216a5d5b383ba8af2.zip | |
Down-integrate from internal code base (C++ maps support).
Diffstat (limited to 'src/google/protobuf/text_format.h')
| -rw-r--r-- | src/google/protobuf/text_format.h | 2 |
1 files changed, 1 insertions, 1 deletions
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_; |