aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler/java/java_map_field_lite.cc
diff options
context:
space:
mode:
authorGravatar Jisi Liu <jisi.liu@gmail.com>2015-08-21 11:42:27 -0700
committerGravatar Jisi Liu <jisi.liu@gmail.com>2015-08-21 11:44:49 -0700
commitc3bc155aceda36ecb01cde2367a3b427f2d7ce40 (patch)
tree195d74745dad40a57d49bf718f50c7751336a405 /src/google/protobuf/compiler/java/java_map_field_lite.cc
parentb0f661181d10bddc08e380992590a1cdd92be92b (diff)
parenteb65c69e14fb711208ad5111cb9672f00864bb6d (diff)
Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
Diffstat (limited to 'src/google/protobuf/compiler/java/java_map_field_lite.cc')
-rw-r--r--src/google/protobuf/compiler/java/java_map_field_lite.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/java/java_map_field_lite.cc b/src/google/protobuf/compiler/java/java_map_field_lite.cc
index ccc1b32e..cd1698f0 100644
--- a/src/google/protobuf/compiler/java/java_map_field_lite.cc
+++ b/src/google/protobuf/compiler/java/java_map_field_lite.cc
@@ -139,9 +139,7 @@ ImmutableMapFieldLiteGenerator(const FieldDescriptor* descriptor,
int messageBitIndex,
int builderBitIndex,
Context* context)
- : descriptor_(descriptor), messageBitIndex_(messageBitIndex),
- builderBitIndex_(builderBitIndex), context_(context),
- name_resolver_(context->GetNameResolver()) {
+ : descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
SetMessageVariables(descriptor, messageBitIndex, builderBitIndex,
context->GetFieldGeneratorInfo(descriptor),
name_resolver_, &variables_);