Fixed bug #ICE-4840: incorrect ["cpp:type:array"] code generated

Fixed test/Ice/plugin run.py script

1 files changed, 5 insertions, 5 deletions

diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 0d8517d42d2..8227dc8f445 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -1087,7 +1087,7 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
 
     string name = fixKwd(p->name());
 
-    bool classMetaData = findMetaData(p->getMetaData()) == "class";
+    bool classMetaData = findMetaData(p->getMetaData()) == "%class";
     if(classMetaData)
     {
         H << sp << nl << "class " << _dllExport << name << " : public IceUtil::Shared";
@@ -1130,7 +1130,7 @@ Slice::Gen::TypesVisitor::visitStructStart(const StructPtr& p)
     // Generate a one-shot constructor if the struct uses the class mapping, or if at least
     // one of its members has a default value.
     //
-    if(!dataMembers.empty() && (findMetaData(p->getMetaData()) == "class" || p->hasDefaultValues()))
+    if(!dataMembers.empty() && (findMetaData(p->getMetaData()) == "%class" || p->hasDefaultValues()))
     {
         DataMemberList::const_iterator q;
         vector<string> paramDecls;
@@ -1194,7 +1194,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
     }
 
     string dllExport;
-    if(findMetaData(p->getMetaData()) != "class")
+    if(findMetaData(p->getMetaData()) != "%class")
     {
         dllExport = _dllExport;
     }
@@ -1303,7 +1303,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
 
     H << eb << ';';
 
-    if(findMetaData(p->getMetaData()) == "class")
+    if(findMetaData(p->getMetaData()) == "%class")
     {
         H << sp << nl << "typedef ::IceUtil::Handle< " << scoped << "> " << p->name() + "Ptr;";
     }
@@ -6105,7 +6105,7 @@ Slice::Gen::StreamVisitor::visitStructStart(const StructPtr& p)
 {
     if(!p->isLocal())
     {
-        bool classMetaData = findMetaData(p->getMetaData(), false) == "class";
+        bool classMetaData = findMetaData(p->getMetaData(), false) == "%class";
         string scoped = p->scoped();
         H << nl << "template<>";
         if(classMetaData)