diff options
| author |  liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-05 23:47:43 +0000 |
|---|---|---|
| committer | liujisi@google.com <liujisi@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-12-05 23:47:43 +0000 |
| commit | 2273ee403b567da66493eff500d6896d52c087d5 (patch) | |
| tree | c37bae37fa805efea6ba12424c5d665503842c8d /src/google/protobuf/compiler/cpp/cpp_message.cc | |
| parent | 0c995c930067241b40b10b0b01504c784cade03e (diff) | |
Add java options to plugin proto and rollback the r450
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_message.cc')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_message.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc index 85f85a57..1ea4f13d 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.cc +++ b/src/google/protobuf/compiler/cpp/cpp_message.cc @@ -857,14 +857,12 @@ GenerateDefaultInstanceInitializer(io::Printer* printer) { void MessageGenerator:: GenerateShutdownCode(io::Printer* printer) { printer->Print( - "delete $classname$::default_instance_;\n" - "$classname$::default_instance_ = NULL;\n", + "delete $classname$::default_instance_;\n", "classname", classname_); if (HasDescriptorMethods(descriptor_->file())) { printer->Print( - "delete $classname$_reflection_;\n" - "$classname$_reflection_ = NULL;\n", + "delete $classname$_reflection_;\n", "classname", classname_); } |