diff options
author | Michi Henning <michi@zeroc.com> | 2004-12-07 05:40:34 +0000 |
---|---|---|
committer | Michi Henning <michi@zeroc.com> | 2004-12-07 05:40:34 +0000 |
commit | 47f6feeb24128d9c85d77f6513a58253a4ce7ea8 (patch) | |
tree | 21ac791073f7b909c4fcf28bffa5c7a996bae482 /cpp/src/Slice/JavaUtil.cpp | |
parent | Added context parameter to checkedCast. (diff) | |
download | ice-47f6feeb24128d9c85d77f6513a58253a4ce7ea8.tar.bz2 ice-47f6feeb24128d9c85d77f6513a58253a4ce7ea8.tar.xz ice-47f6feeb24128d9c85d77f6513a58253a4ce7ea8.zip |
Added additional checks to validate metadata.
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
-rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 5212e7784be..c11e889d3b1 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -2266,21 +2266,36 @@ bool Slice::JavaGenerator::MetaDataVisitor::visitClassDefStart(const ClassDefPtr& p) { validate(p); - return false; + return true; +} + +void +Slice::JavaGenerator::MetaDataVisitor::visitClassDefEnd(const ClassDefPtr&) +{ } bool Slice::JavaGenerator::MetaDataVisitor::visitExceptionStart(const ExceptionPtr& p) { validate(p); - return false; + return true; +} + +void +Slice::JavaGenerator::MetaDataVisitor::visitExceptionEnd(const ExceptionPtr&) +{ } bool Slice::JavaGenerator::MetaDataVisitor::visitStructStart(const StructPtr& p) { validate(p); - return false; + return true; +} + +void +Slice::JavaGenerator::MetaDataVisitor::visitStructEnd(const StructPtr&) +{ } void @@ -2365,6 +2380,11 @@ Slice::JavaGenerator::MetaDataVisitor::validate(const ContainedPtr& cont) { cout << file << ": warning: ignoring invalid metadata `" << s << "'" << endl; } + if(SequencePtr::dynamicCast(cont)) + { + continue; + } + cout << file << ": warning: ignoring invalid metadata `" << s << "'" << endl; } _history.insert(s); } |