diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-02-16 10:28:48 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-02-16 10:28:48 -0330 |
| commit | 5244c444d937a4fa586ef77e2255fb090cc4cf72 (patch) | |
| tree | 327561a040644b1a5293da0e60b58d7916d08715 /cpp/src | |
| parent | bug 3643 - update tp README wrt db patches (diff) | |
| parent | Fix to Slice::filterMcppWarnings (diff) | |
| download | ice-5244c444d937a4fa586ef77e2255fb090cc4cf72.tar.bz2 ice-5244c444d937a4fa586ef77e2255fb090cc4cf72.tar.xz ice-5244c444d937a4fa586ef77e2255fb090cc4cf72.zip | |
Merge branch 'R3_3_branch' of ssh://cvs.wpb.zeroc.com/home/git/ice into R3_3_branch
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Slice/Util.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/Util.cpp index b5bef1942ed..c85d58b6e3c 100644 --- a/cpp/src/Slice/Util.cpp +++ b/cpp/src/Slice/Util.cpp @@ -266,8 +266,10 @@ Slice::filterMcppWarnings(const string& message) vector<string> in; vector<string> out; IceUtilInternal::splitString(message, "\n", in); + bool skiped; for(vector<string>::const_iterator i = in.begin(); i != in.end(); i++) { + skiped = false; static const string warningPrefix = "warning:"; if(i->find(warningPrefix) != string::npos) { @@ -279,11 +281,15 @@ Slice::filterMcppWarnings(const string& message) // next line should also be skiped it contains the slice line that // produces the skiped warning i++; + skiped = true; break; } } } - out.push_back(*i + "\n"); + if(!skiped) + { + out.push_back(*i + "\n"); + } } return out; } |