summaryrefslogtreecommitdiff
path: root/cpp/src/slice2objc/ObjCUtil.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2021-01-08 15:55:09 -0500
committerGitHub <noreply@github.com>2021-01-08 15:55:09 -0500
commitcf623fd25b942c4f79d2c156e4cbcb622f061f46 (patch)
tree11efc86a57808519ce9ec95934cb6f7a7fef6664 /cpp/src/slice2objc/ObjCUtil.cpp
parentAdded libedit (diff)
downloadice-cf623fd25b942c4f79d2c156e4cbcb622f061f46.tar.bz2
ice-cf623fd25b942c4f79d2c156e4cbcb622f061f46.tar.xz
ice-cf623fd25b942c4f79d2c156e4cbcb622f061f46.zip
Rename global metadata to local metadata. (#1231)
Fixes #828
Diffstat (limited to 'cpp/src/slice2objc/ObjCUtil.cpp')
-rw-r--r--cpp/src/slice2objc/ObjCUtil.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2objc/ObjCUtil.cpp b/cpp/src/slice2objc/ObjCUtil.cpp
index 7dd96a71688..1848cbcbf4d 100644
--- a/cpp/src/slice2objc/ObjCUtil.cpp
+++ b/cpp/src/slice2objc/ObjCUtil.cpp
@@ -1054,7 +1054,7 @@ bool
Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
{
//
- // Validate global metadata in the top-level file and all included files.
+ // Validate file metadata in the top-level file and all included files.
//
StringList files = p->allFiles();
@@ -1080,7 +1080,7 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
if(headerDir > 1)
{
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s
+ ostr << "ignoring invalid file metadata `" << s
<< "': directive can appear only once per file";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(s);
@@ -1093,7 +1093,7 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
if(dllExport > 1)
{
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s
+ ostr << "ignoring invalid file metadata `" << s
<< "': directive can appear only once per file";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(s);
@@ -1102,7 +1102,7 @@ Slice::ObjCGenerator::MetaDataVisitor::visitUnitStart(const UnitPtr& p)
}
ostringstream ostr;
- ostr << "ignoring invalid global metadata `" << s << "'";
+ ostr << "ignoring invalid file metadata `" << s << "'";
dc->warning(InvalidMetaData, file, -1, ostr.str());
globalMetaData.remove(s);