Index: third_party/protobuf/src/google/protobuf/compiler/python/python_plugin_unittest.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/python/python_plugin_unittest.cc b/third_party/protobuf/src/google/protobuf/compiler/python/python_plugin_unittest.cc |
index da619ad3e91fe7a408c391044708b60ab6ee2df1..e82bbae7b9057fc9a1e63c149a57fac5568a9d99 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/python/python_plugin_unittest.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/python/python_plugin_unittest.cc |
@@ -1,6 +1,6 @@ |
// Protocol Buffers - Google's data interchange format |
// Copyright 2008 Google Inc. All rights reserved. |
-// http://code.google.com/p/protobuf/ |
+// https://developers.google.com/protocol-buffers/ |
// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
@@ -34,6 +34,11 @@ |
// It seemed like parameterizing it would add more complexity than it is |
// worth. |
+#include <memory> |
+#ifndef _SHARED_PTR_H |
+#include <google/protobuf/stubs/shared_ptr.h> |
+#endif |
+ |
#include <google/protobuf/compiler/python/python_generator.h> |
#include <google/protobuf/compiler/command_line_interface.h> |
#include <google/protobuf/io/zero_copy_stream.h> |
@@ -67,8 +72,8 @@ class TestGenerator : public CodeGenerator { |
void TryInsert(const string& filename, const string& insertion_point, |
GeneratorContext* context) const { |
- scoped_ptr<io::ZeroCopyOutputStream> output( |
- context->OpenForInsert(filename, insertion_point)); |
+ google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output( |
+ context->OpenForInsert(filename, insertion_point)); |
io::Printer printer(output.get(), '$'); |
printer.Print("// inserted $name$\n", "name", insertion_point); |
} |
@@ -78,13 +83,13 @@ class TestGenerator : public CodeGenerator { |
// not verify that they are correctly-placed; that would require actually |
// compiling the output which is a bit more than I care to do for this test. |
TEST(PythonPluginTest, PluginTest) { |
- File::WriteStringToFileOrDie( |
- "syntax = \"proto2\";\n" |
- "package foo;\n" |
- "message Bar {\n" |
- " message Baz {}\n" |
- "}\n", |
- TestTempDir() + "/test.proto"); |
+ GOOGLE_CHECK_OK(File::SetContents(TestTempDir() + "/test.proto", |
+ "syntax = \"proto2\";\n" |
+ "package foo;\n" |
+ "message Bar {\n" |
+ " message Baz {}\n" |
+ "}\n", |
+ true)); |
google::protobuf::compiler::CommandLineInterface cli; |
cli.SetInputsAreProtoPathRelative(true); |