diff options
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 43 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Main.cpp | 34 |
2 files changed, 67 insertions, 10 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 74bf4315893..73bff267ba7 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2608,6 +2608,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) bool hasBaseClass = !bases.empty() && !bases.front()->isInterface(); bool override = p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic()); + bool hasGCObjectBaseClass = basePreserved || override || preserved; if(!basePreserved && (override || preserved)) { H << ", public ::IceInternal::GCObject"; @@ -2800,11 +2801,23 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) { H << nl << "virtual ::Ice::ObjectPtr ice_clone() const;"; + if(hasGCObjectBaseClass) + { + C.zeroIndent(); + C << sp; + C << nl << "#if defined(_MSC_VER) && (_MSC_VER >= 1900)"; + C << nl << "# pragma warning(push)"; + C << nl << "# pragma warning(disable:4589)"; + C << nl << "#endif"; + C.restoreIndent(); + } C << nl << "::Ice::ObjectPtr"; C << nl << scoped.substr(2) << "::ice_clone() const"; C << sb; if(!p->isAbstract()) { + + C << nl << "::Ice::Object* __p = new " << name << "(*this);"; C << nl << "return __p;"; } @@ -2816,6 +2829,14 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) C << nl << "throw ::Ice::CloneNotImplementedException(__FILE__, __LINE__);"; } C << eb; + if(hasGCObjectBaseClass) + { + C.zeroIndent(); + C << nl << "#if defined(_MSC_VER) && (_MSC_VER >= 1900)"; + C << nl << "# pragma warning(pop)"; + C << nl << "#endif"; + C.restoreIndent(); + } } ClassList allBases = p->allBases(); @@ -3872,10 +3893,17 @@ Slice::Gen::ObjectVisitor::emitOneShotConstructor(const ClassDefPtr& p) { vector<string> allParamDecls; + bool virtualInheritance = p->hasMetaData("cpp:virtual"); + bool callBaseConstuctors = !(p->isAbstract() && virtualInheritance); + DataMemberList dataMembers = p->dataMembers(); + for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q) { + string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring); - allParamDecls.push_back(typeName + " __ice_" + (*q)->name()); + bool dataMember = std::find(dataMembers.begin(), dataMembers.end(), (*q)) != dataMembers.end(); + allParamDecls.push_back(typeName + ((dataMember || callBaseConstuctors) ? + (" __ice_" + (*q)->name()) : (" /*__ice_" + (*q)->name() + "*/"))); } H << sp << nl; @@ -3883,16 +3911,19 @@ Slice::Gen::ObjectVisitor::emitOneShotConstructor(const ClassDefPtr& p) { H << "explicit "; } - H << fixKwd(p->name()) << spar << allParamDecls << epar << " :"; + H << fixKwd(p->name()) << spar << allParamDecls << epar; + if(callBaseConstuctors || !dataMembers.empty()) + { + H << " :"; + } H.inc(); - DataMemberList dataMembers = p->dataMembers(); - ClassList bases = p->bases(); ClassDefPtr base; - if(!bases.empty() && !bases.front()->isInterface()) + + if(!bases.empty() && !bases.front()->isInterface() && callBaseConstuctors) { - if(emitVirtualBaseInitializers(bases.front(), p->hasMetaData("cpp:virtual"), true)) + if(emitVirtualBaseInitializers(bases.front(), virtualInheritance, true)) { if(!dataMembers.empty()) { diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index 3e6a9ee3584..c0da52fdaec 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -61,6 +61,7 @@ usage(const char* n) "Options:\n" "-h, --help Show this message.\n" "-v, --version Display the Ice version.\n" + "--validate Validate command line options.\n" "--header-ext EXT Use EXT instead of the default `h' extension.\n" "--source-ext EXT Use EXT instead of the default `cpp' extension.\n" "--add-header HDR[,GUARD] Add #include for HDR (with guard GUARD) to generated source file.\n" @@ -90,6 +91,7 @@ compile(int argc, char* argv[]) IceUtilInternal::Options opts; opts.addOpt("h", "help"); opts.addOpt("v", "version"); + opts.addOpt("", "validate"); opts.addOpt("", "header-ext", IceUtilInternal::Options::NeedArg, "h"); opts.addOpt("", "source-ext", IceUtilInternal::Options::NeedArg, "cpp"); opts.addOpt("", "add-header", IceUtilInternal::Options::NeedArg, "", IceUtilInternal::Options::Repeat); @@ -110,6 +112,16 @@ compile(int argc, char* argv[]) opts.addOpt("", "checksum"); opts.addOpt("", "stream"); + bool validate = false; + for(int i = 0; i < argc; ++i) + { + if(string(argv[i]) == "--validate") + { + validate = true; + break; + } + } + vector<string> args; try { @@ -118,7 +130,10 @@ compile(int argc, char* argv[]) catch(const IceUtilInternal::BadOptException& e) { getErrorStream() << argv[0] << ": " << e.reason << endl; - usage(argv[0]); + if(!validate) + { + usage(argv[0]); + } return EXIT_FAILURE; } @@ -188,17 +203,28 @@ compile(int argc, char* argv[]) if(args.empty()) { getErrorStream() << argv[0] << ": error: no input file" << endl; - usage(argv[0]); + if(!validate) + { + usage(argv[0]); + } return EXIT_FAILURE; } if(depend && dependxml) { - getErrorStream() << argv[0] << ": error: cannot specify both --depend and --dependxml" << endl; - usage(argv[0]); + getErrorStream() << argv[0] << ": error: cannot specify both --depend and --depend-xml" << endl; + if(!validate) + { + usage(argv[0]); + } return EXIT_FAILURE; } + if(validate) + { + return EXIT_SUCCESS; + } + int status = EXIT_SUCCESS; IceUtil::CtrlCHandler ctrlCHandler; |