From 2273ee403b567da66493eff500d6896d52c087d5 Mon Sep 17 00:00:00 2001 From: "liujisi@google.com" Date: Wed, 5 Dec 2012 23:47:43 +0000 Subject: Add java options to plugin proto and rollback the r450 --- src/google/protobuf/compiler/cpp/cpp_string_field.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/google/protobuf/compiler/cpp/cpp_string_field.cc') diff --git a/src/google/protobuf/compiler/cpp/cpp_string_field.cc b/src/google/protobuf/compiler/cpp/cpp_string_field.cc index 81d06549..9c0911ac 100644 --- a/src/google/protobuf/compiler/cpp/cpp_string_field.cc +++ b/src/google/protobuf/compiler/cpp/cpp_string_field.cc @@ -251,8 +251,7 @@ void StringFieldGenerator:: GenerateShutdownCode(io::Printer* printer) const { if (!descriptor_->default_value_string().empty()) { printer->Print(variables_, - "delete $classname$::$default_variable$;\n" - "$classname$::$default_variable$ = NULL;\n"); + "delete $classname$::$default_variable$;\n"); } } -- cgit v1.2.3