diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-11-07 15:11:04 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-11-07 15:11:04 -0500 |
| commit | e459b172e29d7cd827eb7134a82b424ea617a2fc (patch) | |
| tree | bea03ce0e7c0fb6480098a914bb5b0a77225eb62 /cpp/src/slice2java/Main.cpp | |
| parent | Update android gradle wrapper (diff) | |
| download | ice-e459b172e29d7cd827eb7134a82b424ea617a2fc.tar.bz2 ice-e459b172e29d7cd827eb7134a82b424ea617a2fc.tar.xz ice-e459b172e29d7cd827eb7134a82b424ea617a2fc.zip | |
Javadoc improvements. Fixes #71.
Diffstat (limited to 'cpp/src/slice2java/Main.cpp')
| -rw-r--r-- | cpp/src/slice2java/Main.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 48f6c8916ba..2150bf92dd0 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -23,17 +23,6 @@ using namespace std; using namespace Slice; using namespace IceUtilInternal; -// TODO: fix this warning! -#if defined(_MSC_VER) -# pragma warning(disable:4456) // shadow -# pragma warning(disable:4457) // shadow -# pragma warning(disable:4459) // shadow -#elif defined(__clang__) -# pragma clang diagnostic ignored "-Wshadow" -#elif defined(__GNUC__) -# pragma GCC diagnostic ignored "-Wshadow" -#endif - namespace { @@ -274,8 +263,8 @@ compile(const vector<string>& argv) // // Ignore duplicates. // - vector<string>::iterator p = find(args.begin(), args.end(), *i); - if(p != i) + vector<string>::iterator j = find(args.begin(), args.end(), *i); + if(j != i) { continue; } @@ -312,7 +301,6 @@ compile(const vector<string>& argv) } else { - ostringstream os; FileTracker::instance()->setSource(*i); PreprocessorPtr icecpp = Preprocessor::create(argv[0], *i, cppArgs); |