diff options
| author |  Nobuaki Sukegawa <nsukeg@gmail.com> | 2014-11-29 22:03:31 +0900 |
|---|---|---|
| committer | Nobuaki Sukegawa <nsukeg@gmail.com> | 2014-12-03 23:41:40 +0900 |
| commit | 2413cb57efd31983b810cb256cdb48d9b8a062fb (patch) | |
| tree | b36be974d08cc02aeec3720a8c1e6f7176d175e3 /src | |
| parent | 4470dcba6c41a9fcb749d69b1414d7b75991bdc1 (diff) | |
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 "<class 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_message.cc | 2 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_string_field.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc index 212bc3e9..e71d35fa 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.cc +++ b/src/google/protobuf/compiler/cpp/cpp_message.cc @@ -1226,7 +1226,7 @@ GenerateDescriptorDeclarations(io::Printer* printer) { for (int j = 0; j < descriptor_->oneof_decl(i)->field_count(); j++) { const FieldDescriptor* field = descriptor_->oneof_decl(i)->field(j); printer->Print(" "); - if (IsStringOrMessage(field)) { + if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) { printer->Print("const "); } field_generators_.get(field).GeneratePrivateMembers(printer); 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"); } |