diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index a99184e..1d695d8 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -470,26 +470,26 @@ using namespace std; #define __forD1(i, LoopCount) for(i=1; i<=LoopCount; ++i) -#define __for_i( IterType, IterObj, IterVar) \ +#define __for_it( IterType, IterObj, IterVar) \ for ( \ typename IterType:: iterator \ IterVar=IterObj.begin(); \ IterVar<=IterObj.size(); ++IterVar \ ) -#define __for_ic(IterType, IterObj, IterVar) \ +#define __for_itc(IterType, IterObj, IterVar) \ for ( \ typename IterType::const_iterator \ IterVar=IterObj.cbegin(); \ IterVar<=IterObj.size(); ++IterVar \ ) -#define __for_i_r( IterType, IterObj, IterVar) \ +#define __for_it_r( IterType, IterObj, IterVar) \ for ( \ typename IterType:: iterator \ IterVar=IterObj.end(); \ IterVar>0; --IterVar \ ) -#define __for_i_rc(IterType, IterObj, IterVar) \ +#define __for_it_rc(IterType, IterObj, IterVar) \ for ( \ typename IterType::const_iterator \ IterVar=IterObj.cend(); \ diff --git a/ZCppMainTest/ZtCBaseList_000.cpp b/ZCppMainTest/ZtCBaseList_000.cpp index 91f1c25..e4eb1b9 100644 --- a/ZCppMainTest/ZtCBaseList_000.cpp +++ b/ZCppMainTest/ZtCBaseList_000.cpp @@ -679,20 +679,20 @@ namespace ZNsMain cout<<"*****************************************************"<