From f157a5651c79a7a36e242af216a5d5b383ba8af2 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Fri, 14 Nov 2014 11:50:31 -0800 Subject: Down-integrate from internal code base (C++ maps support). --- src/google/protobuf/compiler/mock_code_generator.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/google/protobuf/compiler/mock_code_generator.cc') diff --git a/src/google/protobuf/compiler/mock_code_generator.cc b/src/google/protobuf/compiler/mock_code_generator.cc index 70373c8e..e7d5117e 100644 --- a/src/google/protobuf/compiler/mock_code_generator.cc +++ b/src/google/protobuf/compiler/mock_code_generator.cc @@ -160,7 +160,7 @@ bool MockCodeGenerator::Generate( for (int i = 0; i < insert_into.size(); i++) { { - scoped_ptr output(context->OpenForInsert( + google::protobuf::scoped_ptr output(context->OpenForInsert( GetOutputFileName(insert_into[i], file), kFirstInsertionPointName)); io::Printer printer(output.get(), '$'); printer.PrintRaw(GetOutputFileContent(name_, "first_insert", @@ -172,7 +172,7 @@ bool MockCodeGenerator::Generate( } { - scoped_ptr output( + google::protobuf::scoped_ptr output( context->OpenForInsert(GetOutputFileName(insert_into[i], file), kSecondInsertionPointName)); io::Printer printer(output.get(), '$'); @@ -185,7 +185,7 @@ bool MockCodeGenerator::Generate( } } } else { - scoped_ptr output( + google::protobuf::scoped_ptr output( context->Open(GetOutputFileName(name_, file))); io::Printer printer(output.get(), '$'); -- cgit v1.2.3