diff options
| author | Adam Cozzette <acozzette@google.com> | 2018-03-14 11:17:48 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-03-14 11:17:48 -0700 |
| commit | 67952fab2c766ac5eacc15bb78e5af4039a3d398 (patch) | |
| tree | eaaec1e5a17e676cd08535e15a365d557c332c3b /src/google/protobuf/compiler/javanano/javanano_generator.cc | |
| parent | b1216d95db304326f4c28d6dbc7d0860c43d8208 (diff) | |
| download | protobuf-67952fab2c766ac5eacc15bb78e5af4039a3d398.tar.gz protobuf-67952fab2c766ac5eacc15bb78e5af4039a3d398.tar.bz2 protobuf-67952fab2c766ac5eacc15bb78e5af4039a3d398.zip | |
Deleted scoped_ptr.h
We no longer need this, now that we have finished the switch to C++11
and are using std::unique_ptr.
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_generator.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_generator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_generator.cc b/src/google/protobuf/compiler/javanano/javanano_generator.cc index fd7151b1..64ba3336 100644 --- a/src/google/protobuf/compiler/javanano/javanano_generator.cc +++ b/src/google/protobuf/compiler/javanano/javanano_generator.cc @@ -200,7 +200,7 @@ bool JavaNanoGenerator::Generate(const FileDescriptor* file, all_files.push_back(java_filename); // Generate main java file. - scoped_ptr<io::ZeroCopyOutputStream> output( + std::unique_ptr<io::ZeroCopyOutputStream> output( output_directory->Open(java_filename)); io::Printer printer(output.get(), '$'); file_generator.Generate(&printer); @@ -213,7 +213,7 @@ bool JavaNanoGenerator::Generate(const FileDescriptor* file, if (!output_list_file.empty()) { // Generate output list. This is just a simple text file placed in a // deterministic location which lists the .java files being generated. - scoped_ptr<io::ZeroCopyOutputStream> srclist_raw_output( + std::unique_ptr<io::ZeroCopyOutputStream> srclist_raw_output( output_directory->Open(output_list_file)); io::Printer srclist_printer(srclist_raw_output.get(), '$'); for (int i = 0; i < all_files.size(); i++) { |