THRIFT-2526 Assignment operators and copy constructors in c++ don't copy the __isset struct
Client: cpp
Patch: Doug Judd
diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index f985492..771af46 100755
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -831,11 +831,17 @@
const vector<t_field*>& members = tstruct->get_members();
vector<t_field*>::const_iterator f_iter;
+ bool has_nonrequired_fields = false;
for (f_iter = members.begin(); f_iter != members.end(); ++f_iter) {
+ if ((*f_iter)->get_req() != t_field::T_REQUIRED)
+ has_nonrequired_fields = true;
indent(out) << (*f_iter)->get_name() << " = " << tmp_name << "." <<
(*f_iter)->get_name() << ";" << endl;
}
+ if (has_nonrequired_fields)
+ indent(out) << "__isset = " << tmp_name << ".__isset;" << endl;
+
indent_down();
indent(out) << "}" << endl;
}
@@ -852,10 +858,15 @@
const vector<t_field*>& members = tstruct->get_members();
vector<t_field*>::const_iterator f_iter;
+ bool has_nonrequired_fields = false;
for (f_iter = members.begin(); f_iter != members.end(); ++f_iter) {
+ if ((*f_iter)->get_req() != t_field::T_REQUIRED)
+ has_nonrequired_fields = true;
indent(out) << (*f_iter)->get_name() << " = " << tmp_name << "." <<
(*f_iter)->get_name() << ";" << endl;
}
+ if (has_nonrequired_fields)
+ indent(out) << "__isset = " << tmp_name << ".__isset;" << endl;
indent(out) << "return *this;" << endl;
indent_down();