summaryrefslogtreecommitdiff
path: root/cpp/src/slice2js
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/slice2js
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/slice2js')
-rw-r--r--cpp/src/slice2js/Gen.cpp4
-rw-r--r--cpp/src/slice2js/JsUtil.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2js/Gen.cpp b/cpp/src/slice2js/Gen.cpp
index fa878d44a62..c85f0393748 100644
--- a/cpp/src/slice2js/Gen.cpp
+++ b/cpp/src/slice2js/Gen.cpp
@@ -714,12 +714,12 @@ Slice::Gen::generate(const UnitPtr& p)
printGeneratedHeader(_jsout, _fileBase + ".ice");
//
- // Check for global "js:module:ice" metadata. If this is set then we are building Ice.
+ // Check for file "js:module:ice" metadata. If this is set then we are building Ice.
//
bool icejs = module == "ice";
//
- // Check for global "js:es6-module" metadata. If this is set we are using es6 module mapping
+ // Check for file "js:es6-module" metadata. If this is set we are using es6 module mapping
//
bool es6module = dc->findMetaData("js:es6-module") == "js:es6-module";
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index 4463682a609..73379cda811 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -214,7 +214,7 @@ string
Slice::JsGenerator::getModuleMetadata(const ContainedPtr& p)
{
//
- // Check if the file contains the js:module global metadata.
+ // Check if the file contains the js:module file metadata.
//
DefinitionContextPtr dc = p->definitionContext();
assert(dc);