Fix for Abstrac class generated constructor

Abstract class generated constructor must not
call virtual base class constructors

1 files changed, 16 insertions, 6 deletions

diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 74bf4315893..918e29097a3 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -3872,10 +3872,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 +3890,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())
                 {