diff options
| author | Jose <jose@zeroc.com> | 2009-02-24 17:14:54 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-02-24 17:14:54 +0100 |
| commit | 49987479748fb4f5dd06f72eb9358918bae97606 (patch) | |
| tree | d6a4514eb6b2e03a2d576fb652ad1356e3cf8286 /cpp/src | |
| parent | Fixed bug 2968 - /etc/icegridregistry.conf (diff) | |
| download | ice-49987479748fb4f5dd06f72eb9358918bae97606.tar.bz2 ice-49987479748fb4f5dd06f72eb9358918bae97606.tar.xz ice-49987479748fb4f5dd06f72eb9358918bae97606.zip | |
Minor fixes to metadata messages.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Slice/CsUtil.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/Slice/PythonUtil.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 34af1de3790..c614bd815f0 100644 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -1629,7 +1629,7 @@ Slice::CsGenerator::MetaDataVisitor::visitOperation(const OperationPtr& p) if(!cl->isLocal()) { ostringstream os; - os << "metadata directive `UserException' applies only to local operations " + os << "ignoring invalid metadata `UserException' applies only to local operations " << "but enclosing " << (cl->isInterface() ? "interface" : "class") << "`" << cl->name() << "' is not local"; emitWarning(p->file(), p->line(), os.str()); diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index f0b063fbf59..1d1945aeb85 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -3657,7 +3657,7 @@ Slice::JavaGenerator::MetaDataVisitor::visitOperation(const OperationPtr& p) if(!cl->isLocal()) { ostringstream os; - os << "metadata directive `UserException' applies only to local operations " + os << "ignoring invalid metadata `UserException' applies only to local operations " << "but enclosing " << (cl->isInterface() ? "interface" : "class") << " `" << cl->name() << "' is not local"; emitWarning(p->file(), p->line(), os.str()); @@ -3673,7 +3673,8 @@ Slice::JavaGenerator::MetaDataVisitor::visitOperation(const OperationPtr& p) { if(q->find("java:type:", 0) == 0) { - emitWarning(p->file(), p->line(), "invalid metadata for operation"); + emitWarning(p->file(), p->line(), "ignoring invalid metadata `" + *q + + "' for operation with void return type"); break; } } diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 79dcf784d5d..34fb3bd9654 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -2160,7 +2160,7 @@ Slice::Python::MetaDataVisitor::validateSequence(const string& file, const strin } } } - emitWarning(file, line, "ignoring metadata `" + s + "'"); + emitWarning(file, line, "ignoring invalid metadata `" + s + "'"); } } } @@ -2176,7 +2176,7 @@ Slice::Python::MetaDataVisitor::reject(const ContainedPtr& cont) { if(p->find(prefix) == 0) { - emitWarning(cont->file(), cont->line(), "ignoring metadata `" + *p + "'"); + emitWarning(cont->file(), cont->line(), "ignoring invalid metadata `" + *p + "'"); } } } diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 1e40c9fcfa8..eec1b64ee51 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -5890,7 +5890,7 @@ Slice::Gen::MetaDataVisitor::visitOperation(const OperationPtr& p) if(!cl->isLocal()) { ostringstream ostr; - ostr << "metadata directive `UserException' applies only to local operations " + ostr << "ignoring invalid metadata `UserException' applies only to local operations " << "but enclosing " << (cl->isInterface() ? "interface" : "class") << "`" << cl->name() << "' is not local"; emitWarning(p->file(), p->line(), ostr.str()); @@ -5909,7 +5909,7 @@ Slice::Gen::MetaDataVisitor::visitOperation(const OperationPtr& p) { if(q->find("cpp:type:", 0) == 0 || q->find("cpp:array", 0) == 0 || q->find("cpp:range", 0) == 0) { - emitWarning(p->file(), p->line(), "invalid metadata `" + *q + + emitWarning(p->file(), p->line(), "ignoring invalid metadata `" + *q + "' for operation with void return type"); break; } |