diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
| commit | 4465daa57a4b6910965e9d078ae125ddb9ee8c21 (patch) | |
| tree | e6d5096e6a2a5523d2b1975f6248cd9d8f8957ce /src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc | |
| parent | 15239361e31d53c10b918aa9fe8ce057155588b4 (diff) | |
| parent | 09292d5759cbf3e82dcfae67e01ee31ed8906b5a (diff) | |
| download | protobuf-4465daa57a4b6910965e9d078ae125ddb9ee8c21.tar.gz protobuf-4465daa57a4b6910965e9d078ae125ddb9ee8c21.tar.bz2 protobuf-4465daa57a4b6910965e9d078ae125ddb9ee8c21.zip | |
Merge branch 'master' into internal-merge
Diffstat (limited to 'src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc b/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc index 5fe0b203..bee3f363 100644 --- a/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc +++ b/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc @@ -48,8 +48,8 @@ namespace compiler { namespace csharp { RepeatedPrimitiveFieldGenerator::RepeatedPrimitiveFieldGenerator( - const FieldDescriptor* descriptor, int fieldOrdinal) - : FieldGeneratorBase(descriptor, fieldOrdinal) { + const FieldDescriptor* descriptor, int fieldOrdinal, const Options *options) + : FieldGeneratorBase(descriptor, fieldOrdinal, options) { } RepeatedPrimitiveFieldGenerator::~RepeatedPrimitiveFieldGenerator() { |