diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/Makefile.mak | 4 | ||||
| -rwxr-xr-x | cpp/src/slice2cpp/Gen.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Freeze/Makefile.mak b/cpp/src/Freeze/Makefile.mak index 6efc86b1d51..beb7d6a66ea 100644 --- a/cpp/src/Freeze/Makefile.mak +++ b/cpp/src/Freeze/Makefile.mak @@ -79,7 +79,7 @@ clean:: clean:: del /q $(DLLNAME:.dll=.*) del /q DB.cpp $(HDIR)\DB.h - del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h + del /q BackgroundSaveEvictor.cpp $(HDIR)\BackgroundSaveEvictor.h del /q CatalogData.cpp $(HDIR)\CatalogData.h del /q Connection.cpp $(HDIR)\Connection.h del /q ConnectionF.cpp $(HDIR)\ConnectionF.h @@ -88,7 +88,7 @@ clean:: del /q Evictor.cpp $(HDIR)\Evictor.h del /q EvictorStorage.cpp $(HDIR)\EvictorStorage.h del /q Transaction.cpp $(HDIR)\Transaction.h - del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h + del /q TransactionalEvictor.cpp $(HDIR)\TransactionalEvictor.h del /q PingObject.cpp PingObject.h install:: all diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 2196a6953b5..7694559b5fd 100755 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2999,9 +2999,9 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p) C << eb; C << nl << "__direct.destroy();"; C << eb; - for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i) + for(ExceptionList::const_iterator k = throws.begin(); k != throws.end(); ++k) { - C << nl << "catch(const " << fixKwd((*i)->scoped()) << "&)"; + C << nl << "catch(const " << fixKwd((*k)->scoped()) << "&)"; C << sb; C << nl << "throw;"; C << eb; diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 1b4f40edf09..64870af0e4f 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -4447,9 +4447,9 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p) out << sb; out << nl << "__direct.destroy();"; out << eb; - for(ExceptionList::const_iterator t = throws.begin(); t != throws.end(); ++t) + for(ExceptionList::const_iterator k = throws.begin(); k != throws.end(); ++k) { - string exS = getAbsolute(*t, package); + string exS = getAbsolute(*k, package); out << nl << "catch(" << exS << " __ex)"; out << sb; out << nl << "throw __ex;"; |