3party/protobuf-c
0
0
Fork 0
mirror of https://github.com/protobuf-c/protobuf-c.git synced 2024-12-28 06:10:53 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #333 from protobuf-c/edmonds/protobuf-scoped_ptr-removal

Browse Source 
Convert uses of protobuf's scoped_ptr.h to C++11 std::unique_ptr
This commit is contained in:
Robert Edmonds 2018-08-13 22:06:26 -04:00 committed by GitHub
commit 8073f6ee23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protoc-c/c_field.cc
View File

@ -189,7 +189,7 @@ void FieldGenerator::GenerateDescriptorInitializerGeneric(io::Printer* printer,
FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor) FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor)
: descriptor_(descriptor), : descriptor_(descriptor),
field_generators_( field_generators_(
new scoped_ptr<FieldGenerator>[descriptor->field_count()]) { new std::unique_ptr<FieldGenerator>[descriptor->field_count()]) {
// Construct all the FieldGenerators. // Construct all the FieldGenerators.
for (int i = 0; i < descriptor->field_count(); i++) { for (int i = 0; i < descriptor->field_count(); i++) {
field_generators_[i].reset(MakeGenerator(descriptor->field(i))); field_generators_[i].reset(MakeGenerator(descriptor->field(i)));

3
protoc-c/c_field.h
View File

@ -63,6 +63,7 @@
#ifndef GOOGLE_PROTOBUF_COMPILER_C_FIELD_H__ #ifndef GOOGLE_PROTOBUF_COMPILER_C_FIELD_H__
#define GOOGLE_PROTOBUF_COMPILER_C_FIELD_H__ #define GOOGLE_PROTOBUF_COMPILER_C_FIELD_H__
#include <memory>
#include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/common.h>
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
@ -117,7 +118,7 @@ class FieldGeneratorMap {
private: private:
const Descriptor* descriptor_; const Descriptor* descriptor_;
scoped_array<scoped_ptr<FieldGenerator> > field_generators_; std::unique_ptr<std::unique_ptr<FieldGenerator>[]> field_generators_;
static FieldGenerator* MakeGenerator(const FieldDescriptor* field); static FieldGenerator* MakeGenerator(const FieldDescriptor* field);

8
protoc-c/c_file.cc
View File

@ -83,13 +83,13 @@ FileGenerator::FileGenerator(const FileDescriptor* file,
const string& dllexport_decl) const string& dllexport_decl)
: file_(file), : file_(file),
message_generators_( message_generators_(
new scoped_ptr<MessageGenerator>[file->message_type_count()]), new std::unique_ptr<MessageGenerator>[file->message_type_count()]),
enum_generators_( enum_generators_(
new scoped_ptr<EnumGenerator>[file->enum_type_count()]), new std::unique_ptr<EnumGenerator>[file->enum_type_count()]),
service_generators_( service_generators_(
new scoped_ptr<ServiceGenerator>[file->service_count()]), new std::unique_ptr<ServiceGenerator>[file->service_count()]),
extension_generators_( extension_generators_(
new scoped_ptr<ExtensionGenerator>[file->extension_count()]) { new std::unique_ptr<ExtensionGenerator>[file->extension_count()]) {
for (int i = 0; i < file->message_type_count(); i++) { for (int i = 0; i < file->message_type_count(); i++) {
message_generators_[i].reset( message_generators_[i].reset(

9
protoc-c/c_file.h
View File

@ -63,6 +63,7 @@
#ifndef GOOGLE_PROTOBUF_COMPILER_C_FILE_H__ #ifndef GOOGLE_PROTOBUF_COMPILER_C_FILE_H__
#define GOOGLE_PROTOBUF_COMPILER_C_FILE_H__ #define GOOGLE_PROTOBUF_COMPILER_C_FILE_H__
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/common.h>
@ -98,10 +99,10 @@ class FileGenerator {
private: private:
const FileDescriptor* file_; const FileDescriptor* file_;
scoped_array<scoped_ptr<MessageGenerator> > message_generators_; std::unique_ptr<std::unique_ptr<MessageGenerator>[]> message_generators_;
scoped_array<scoped_ptr<EnumGenerator> > enum_generators_; std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_;
scoped_array<scoped_ptr<ServiceGenerator> > service_generators_; std::unique_ptr<std::unique_ptr<ServiceGenerator>[]> service_generators_;
scoped_array<scoped_ptr<ExtensionGenerator> > extension_generators_; std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_;
// E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}. // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}.
std::vector<string> package_parts_; std::vector<string> package_parts_;

5
protoc-c/c_generator.cc
View File

@ -62,6 +62,7 @@
#include <protoc-c/c_generator.h> #include <protoc-c/c_generator.h>
#include <memory>
#include <vector> #include <vector>
#include <utility> #include <utility>
@ -149,7 +150,7 @@ bool CGenerator::Generate(const FileDescriptor* file,
// Generate header. // Generate header.
{ {
scoped_ptr<io::ZeroCopyOutputStream> output( std::unique_ptr<io::ZeroCopyOutputStream> output(
output_directory->Open(basename + ".h")); output_directory->Open(basename + ".h"));
io::Printer printer(output.get(), '$'); io::Printer printer(output.get(), '$');
file_generator.GenerateHeader(&printer); file_generator.GenerateHeader(&printer);
@ -157,7 +158,7 @@ bool CGenerator::Generate(const FileDescriptor* file,
// Generate cc file. // Generate cc file.
{ {
scoped_ptr<io::ZeroCopyOutputStream> output( std::unique_ptr<io::ZeroCopyOutputStream> output(
output_directory->Open(basename + ".c")); output_directory->Open(basename + ".c"));
io::Printer printer(output.get(), '$'); io::Printer printer(output.get(), '$');
file_generator.GenerateSource(&printer); file_generator.GenerateSource(&printer);

3
protoc-c/c_helpers.cc
View File

@ -60,6 +60,7 @@
// Modified to implement C code by Dave Benson. // Modified to implement C code by Dave Benson.
#include <memory>
#include <vector> #include <vector>
#include <set> #include <set>
#include <stdio.h> // for snprintf #include <stdio.h> // for snprintf
@ -559,7 +560,7 @@ static int CEscapeInternal(const char* src, int src_len, char* dest,
} }
string CEscape(const string& src) { string CEscape(const string& src) {
const int dest_length = src.size() * 4 + 1; // Maximum possible expansion const int dest_length = src.size() * 4 + 1; // Maximum possible expansion
scoped_array<char> dest(new char[dest_length]); std::unique_ptr<char[]> dest(new char[dest_length]);
const int len = CEscapeInternal(src.data(), src.size(), const int len = CEscapeInternal(src.data(), src.size(),
dest.get(), dest_length, false); dest.get(), dest_length, false);
GOOGLE_DCHECK_GE(len, 0); GOOGLE_DCHECK_GE(len, 0);

7
protoc-c/c_message.cc
View File

@ -62,6 +62,7 @@
#include <algorithm> #include <algorithm>
#include <map> #include <map>
#include <memory>
#include <protoc-c/c_message.h> #include <protoc-c/c_message.h>
#include <protoc-c/c_enum.h> #include <protoc-c/c_enum.h>
#include <protoc-c/c_extension.h> #include <protoc-c/c_extension.h>
@ -83,11 +84,11 @@ MessageGenerator::MessageGenerator(const Descriptor* descriptor,
: descriptor_(descriptor), : descriptor_(descriptor),
dllexport_decl_(dllexport_decl), dllexport_decl_(dllexport_decl),
field_generators_(descriptor), field_generators_(descriptor),
nested_generators_(new scoped_ptr<MessageGenerator>[ nested_generators_(new std::unique_ptr<MessageGenerator>[
descriptor->nested_type_count()]), descriptor->nested_type_count()]),
enum_generators_(new scoped_ptr<EnumGenerator>[ enum_generators_(new std::unique_ptr<EnumGenerator>[
descriptor->enum_type_count()]), descriptor->enum_type_count()]),
extension_generators_(new scoped_ptr<ExtensionGenerator>[ extension_generators_(new std::unique_ptr<ExtensionGenerator>[
descriptor->extension_count()]) { descriptor->extension_count()]) {
for (int i = 0; i < descriptor->nested_type_count(); i++) { for (int i = 0; i < descriptor->nested_type_count(); i++) {

7
protoc-c/c_message.h
View File

@ -63,6 +63,7 @@
#ifndef GOOGLE_PROTOBUF_COMPILER_C_MESSAGE_H__ #ifndef GOOGLE_PROTOBUF_COMPILER_C_MESSAGE_H__
#define GOOGLE_PROTOBUF_COMPILER_C_MESSAGE_H__ #define GOOGLE_PROTOBUF_COMPILER_C_MESSAGE_H__
#include <memory>
#include <string> #include <string>
#include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/common.h>
#include <protoc-c/c_field.h> #include <protoc-c/c_field.h>
@ -126,9 +127,9 @@ class MessageGenerator {
const Descriptor* descriptor_; const Descriptor* descriptor_;
string dllexport_decl_; string dllexport_decl_;
FieldGeneratorMap field_generators_; FieldGeneratorMap field_generators_;
scoped_array<scoped_ptr<MessageGenerator> > nested_generators_; std::unique_ptr<std::unique_ptr<MessageGenerator>[]> nested_generators_;
scoped_array<scoped_ptr<EnumGenerator> > enum_generators_; std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_;
scoped_array<scoped_ptr<ExtensionGenerator> > extension_generators_; std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator); GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator);
}; };