diff options
Diffstat (limited to 'cpp/src/slice2py/Main.cpp')
| -rw-r--r-- | cpp/src/slice2py/Main.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp index dee21f342b1..4a4ca29b5b5 100644 --- a/cpp/src/slice2py/Main.cpp +++ b/cpp/src/slice2py/Main.cpp @@ -335,8 +335,6 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis } FileTracker::instance()->addFile(initPath); - StringList::const_iterator p; - os << "# Generated by slice2py - DO NOT EDIT!" << endl << "#" << endl; os << endl @@ -344,14 +342,14 @@ PackageVisitor::writeInit(const string& dir, const string& name, const StringLis << "Ice.updateModule(\"" << name << "\")" << endl << endl; os << _moduleTag << endl; - for(p = modules.begin(); p != modules.end(); ++p) + for(StringList::const_iterator p = modules.begin(); p != modules.end(); ++p) { os << "import " << *p << endl; } os << endl; os << _submoduleTag << endl; - for(p = submodules.begin(); p != submodules.end(); ++p) + for(StringList::const_iterator p = submodules.begin(); p != submodules.end(); ++p) { os << "import " << *p << endl; } @@ -427,20 +425,19 @@ compile(int argc, char* argv[]) vector<string> cppArgs; vector<string> optargs = opts.argVec("D"); - vector<string>::const_iterator i; - for(i = optargs.begin(); i != optargs.end(); ++i) + for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i) { cppArgs.push_back("-D" + *i); } optargs = opts.argVec("U"); - for(i = optargs.begin(); i != optargs.end(); ++i) + for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i) { cppArgs.push_back("-U" + *i); } vector<string> includePaths = opts.argVec("I"); - for(i = includePaths.begin(); i != includePaths.end(); ++i) + for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i) { cppArgs.push_back("-I" + Preprocessor::normalizeIncludePath(*i)); } @@ -479,7 +476,7 @@ compile(int argc, char* argv[]) bool keepComments = true; - for(i = args.begin(); i != args.end(); ++i) + for(vector<string>::const_iterator i = args.begin(); i != args.end(); ++i) { // // Ignore duplicates. |