diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-02-04 16:48:50 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-02-04 16:48:50 -0500 |
| commit | abb5616afdbe48c59b0f09f4b11aaa6fc5bb13be (patch) | |
| tree | 900cd08e75cd11aceee75c7ab93085cbea824e60 /cpp/src/slice2objc | |
| parent | Fixed (ICE-7556) - header-ext and makefile dependencies (diff) | |
| download | ice-abb5616afdbe48c59b0f09f4b11aaa6fc5bb13be.tar.bz2 ice-abb5616afdbe48c59b0f09f4b11aaa6fc5bb13be.tar.xz ice-abb5616afdbe48c59b0f09f4b11aaa6fc5bb13be.zip | |
Slice compilers now emit deprecated warning for classes with operations (ICE-7557)
Refactored suppress-warning implementation
Diffstat (limited to 'cpp/src/slice2objc')
| -rw-r--r-- | cpp/src/slice2objc/ObjCUtil.cpp | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp index e86290b8db3..6cd8afd835a 100644 --- a/cpp/src/slice2objc/ObjCUtil.cpp +++ b/cpp/src/slice2objc/ObjCUtil.cpp @@ -1066,7 +1066,6 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p) DefinitionContextPtr dc = p->findDefinitionContext(file); assert(dc); StringList globalMetaData = dc->getMetaData(); - bool emitWarnings = dc->suppressWarning("invalid-metadata"); int headerDir = 0; int dllExport = 0; for(StringList::const_iterator r = globalMetaData.begin(); r != globalMetaData.end();) @@ -1082,13 +1081,10 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p) headerDir++; if(headerDir > 1) { - if(emitWarnings) - { - ostringstream ostr; - ostr << "ignoring invalid global metadata `" << s - << "': directive can appear only once per file"; - emitWarning(file, -1, ostr.str()); - } + ostringstream ostr; + ostr << "ignoring invalid global metadata `" << s + << "': directive can appear only once per file"; + dc->warning(InvalidMetaData, file, -1, ostr.str()); globalMetaData.remove(s); } continue; @@ -1098,23 +1094,19 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p) dllExport++; if(dllExport > 1) { - if(emitWarnings) - { - ostringstream ostr; - ostr << "ignoring invalid global metadata `" << s - << "': directive can appear only once per file"; - emitWarning(file, -1, ostr.str()); - } + ostringstream ostr; + ostr << "ignoring invalid global metadata `" << s + << "': directive can appear only once per file"; + dc->warning(InvalidMetaData, file, -1, ostr.str()); globalMetaData.remove(s); } continue; } - if(emitWarnings) - { - ostringstream ostr; - ostr << "ignoring invalid global metadata `" << s << "'"; - emitWarning(file, -1, ostr.str()); - } + + ostringstream ostr; + ostr << "ignoring invalid global metadata `" << s << "'"; + dc->warning(InvalidMetaData, file, -1, ostr.str()); + globalMetaData.remove(s); } } |