for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
o << "class " << it->ret_classname() << " : public libt2n::result\n"
<< "{\n"
- << "private:\n"
- << " " << it->ret_type << " res;\n"
- << " friend class boost::serialization::access;\n"
+ << "private:\n";
+ if (it->ret_type.name!="void")
+ o << " " << it->ret_type << " res;\n";
+ o << " friend class boost::serialization::access;\n"
<< " template<class Archive>\n"
<< " void serialize(Archive & ar, const unsigned int /* version */)\n"
<< " {\n"
- << " ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::result);\n"
- << " ar & BOOST_SERIALIZATION_NVP(res);\n"
- << " }\n"
+ << " ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(libt2n::result);\n";
+ if (it->ret_type.name!="void")
+ o << " ar & BOOST_SERIALIZATION_NVP(res);\n";
+ o << " }\n"
<< "public:\n"
- << " " << it->ret_classname() << "() {}\n"
- << " " << it->ret_classname() << "(const " << it->ret_type << " &_res) : res(_res) {}\n"
- << " " << it->ret_type << " get_data() { return res; }\n"
- << "};\n";
+ << " " << it->ret_classname() << "() {}\n";
+ if (it->ret_type.name!="void") {
+ o << " " << it->ret_classname() << "(const " << it->ret_type << " &_res) : res(_res) {}\n"
+ << " " << it->ret_type << " get_data() { return res; }\n";
+ }
+ o << "};\n";
}
for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
o << "class " << it->cmd_classname() << " : public " << groupClass(group) << "\n"
<< " " << it->cmd_classname() << "() {}\n";
// constructor taking all arguments
- o << " " << it->cmd_classname() << "(";
- for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+ if (!it->args.empty()) {
+ o << " " << it->cmd_classname() << "(";
+ for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
if (ait!=it->args.begin()) o << ", ";
o << ait->second << " _" << ait->first;
- }
- o << ") : ";
- for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+ }
+ o << ") : ";
+ for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
if (ait!=it->args.begin()) o << ", ";
// pointers are const pointers and must be dereferenced
o << ait->first << "(" << ((ait->second.name.find_first_of('*')!=std::string::npos) ? "*" : "" ) << "_" << ait->first << ")";
+ }
+ o << " {}\n";
}
- o << " {}\n"
- << " libt2n::result* operator()();\n"
+ o << " libt2n::result* operator()();\n"
<< "};\n";
}
}
}
o << "), rc);\n"
<< " " << pit->ret_classname() << "* res=dynamic_cast<" << pit->ret_classname() << "*>(rc.get_result());\n"
- << " if (!res) throw libt2n::t2n_communication_error(\"result object of wrong type\");\n"
- << " return res->get_data();\n"
- << "}\n";
+ << " if (!res) throw libt2n::t2n_communication_error(\"result object of wrong type\");\n";
+ if (pit->ret_type.name!="void")
+ o << " return res->get_data();\n";
+ o << "}\n";
}
// include in this compilation unit to ensure the compilation unit is used
for (std::list<t2n_procedure>::const_iterator it=procs.begin();it!=procs.end();++it) {
o << *it << ";\n";
- o << "libt2n::result* " << it->cmd_classname() << "::operator()() { return new " << it->ret_classname() << "(" << it->name << "(";
- for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
- if (ait!=it->args.begin()) o << ", ";
- // get pointer
- if (ait->second.name.find_first_of('*')!=std::string::npos)
- o << '&';
- o << ait->first;
+ o << "libt2n::result* " << it->cmd_classname() << "::operator()() { ";
+ if (it->ret_type.name!="void") {
+ o << "return new " << it->ret_classname() << "(" << it->name << "(";
+ for (t2n_procedure::Args::const_iterator ait=it->args.begin();ait!=it->args.end();++ait) {
+ if (ait!=it->args.begin()) o << ", ";
+ // get pointer
+ if (ait->second.name.find_first_of('*')!=std::string::npos)
+ o << '&';
+ o << ait->first;
+ }
+ o << "));";
+ }else{
+ o << it->name << "(); return new " << it->ret_classname() << "();";
}
- o << ")); }\n";
+ o << " }\n";
}
o << "#include \"" << common_cpp << "\"\n";
}