diff options
author | Bernard Normier <bernard@zeroc.com> | 2021-01-08 15:55:09 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-08 15:55:09 -0500 |
commit | cf623fd25b942c4f79d2c156e4cbcb622f061f46 (patch) | |
tree | 11efc86a57808519ce9ec95934cb6f7a7fef6664 /cpp/src/Slice/JavaUtil.cpp | |
parent | Added libedit (diff) | |
download | ice-cf623fd25b942c4f79d2c156e4cbcb622f061f46.tar.bz2 ice-cf623fd25b942c4f79d2c156e4cbcb622f061f46.tar.xz ice-cf623fd25b942c4f79d2c156e4cbcb622f061f46.zip |
Rename global metadata to local metadata. (#1231)
Fixes #828
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
-rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 78dd64f2080..51b2a512181 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -139,7 +139,7 @@ public: static const string prefix = "java:"; // - // 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(); @@ -166,7 +166,7 @@ public: } else { - dc->warning(InvalidMetaData, file, "", "ignoring invalid global metadata `" + s + "'"); + dc->warning(InvalidMetaData, file, "", "ignoring invalid file metadata `" + s + "'"); globalMetaData.remove(s); continue; } @@ -953,7 +953,7 @@ Slice::JavaCompatGenerator::getPackagePrefix(const ContainedPtr& cont) const assert(m); // - // The java:package metadata can be defined as global metadata or applied to a top-level module. + // The java:package metadata can be defined as file metadata or applied to a top-level module. // We check for the metadata at the top-level module first and then fall back to the global scope. // static const string prefix = "java:package:"; @@ -3433,7 +3433,7 @@ Slice::JavaGenerator::getPackagePrefix(const ContainedPtr& cont) const assert(m); // - // The java:package metadata can be defined as global metadata or applied to a top-level module. + // The java:package metadata can be defined as file metadata or applied to a top-level module. // We check for the metadata at the top-level module first and then fall back to the global scope. // static const string prefix = "java:package:"; |