diff options
| author | Mark Spruiell <mes@zeroc.com> | 2009-03-06 16:16:53 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2009-03-06 16:16:53 -0800 |
| commit | 2dfd31c03251200ca2c879857747a6f85603a152 (patch) | |
| tree | 77c3876fc1691918160a87d2a3ce1b866e99ee07 /cpp/src/slice2java/Main.cpp | |
| parent | Fixing several issues in the Eclipse plug-in's property pane: (diff) | |
| download | ice-2dfd31c03251200ca2c879857747a6f85603a152.tar.bz2 ice-2dfd31c03251200ca2c879857747a6f85603a152.tar.xz ice-2dfd31c03251200ca2c879857747a6f85603a152.zip | |
do not emit Java2 warning for --depend-xml or --list-generated
Diffstat (limited to 'cpp/src/slice2java/Main.cpp')
| -rw-r--r-- | cpp/src/slice2java/Main.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 7791dd0d72f..32cf33567d8 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -154,6 +154,8 @@ main(int argc, char* argv[]) bool stream = opts.isSet("stream"); + bool listGenerated = opts.isSet("list-generated"); + StringList globalMetadata; vector<string> v = opts.argVec("meta"); copy(v.begin(), v.end(), back_inserter(globalMetadata)); @@ -171,7 +173,7 @@ main(int argc, char* argv[]) } } - if(java2) + if(java2 && !listGenerated && !dependxml) { getErrorStream() << argv[0] << ": warning: The Java2 mapping is deprecated." << endl; } @@ -217,7 +219,7 @@ main(int argc, char* argv[]) else { ostringstream os; - if(opts.isSet("list-generated")) + if(listGenerated) { Slice::setErrorStream(os); } @@ -344,7 +346,7 @@ main(int argc, char* argv[]) } } - if(opts.isSet("list-generated")) + if(listGenerated) { FileTracker::instance()->dumpxml(); } |