From 2413cb57efd31983b810cb256cdb48d9b8a062fb Mon Sep 17 00:00:00 2001 From: Nobuaki Sukegawa Date: Sat, 29 Nov 2014 22:03:31 +0900 Subject: Make C++ string oneof field compatible with C++11 string oneof field was generated into "const ArenaStringPtr" field inside "default_oneof_instance_" struct (of name "OneofInstance"). On the other hand, in C++11, const field of type with trivial default constructor causes enclosing type's implicit default constructor to be deleted. Since ArenaStringPtr has tirvial default constructor, this caused default constructor of "default_oneof_instance_" struct to be deleted, making the constructor call inside generated code invalid and fail to compile. --- 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 a7f95044..04ed08c9 100644 --- a/src/google/protobuf/compiler/cpp/cpp_string_field.cc +++ b/src/google/protobuf/compiler/cpp/cpp_string_field.cc @@ -613,8 +613,7 @@ GenerateSwappingCode(io::Printer* printer) const { void StringOneofFieldGenerator:: GenerateConstructorCode(io::Printer* printer) const { printer->Print(variables_, - " const_cast< ::google::protobuf::internal::ArenaStringPtr*>(" - "&$classname$_default_oneof_instance_->$name$_)->UnsafeSetDefault(" + " $classname$_default_oneof_instance_->$name$_.UnsafeSetDefault(" "$default_variable$);\n"); } -- cgit v1.2.3