diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 63b2109..00580c0 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -470,75 +470,75 @@ using namespace std; #define __forD1(i, LoopCount) for(i=1; i<=LoopCount; ++i) -#define __for_it( IterType, IterObj, IterVar) \ +#define __for_it( MainType, IterObj, IterVar) \ for ( \ - typename IterType:: iterator \ + typename MainType:: iterator \ IterVar=IterObj.begin(); \ IterVar<=IterObj.size(); ++IterVar \ ) -#define __for_itc(IterType, IterObj, IterVar) \ +#define __for_itc(MainType, IterObj, IterVar) \ for ( \ - typename IterType::const_iterator \ + typename MainType::const_iterator \ IterVar=IterObj.cbegin(); \ IterVar<=IterObj.size(); ++IterVar \ ) -#define __for_it_r( IterType, IterObj, IterVar) \ +#define __for_it_r( MainType, IterObj, IterVar) \ for ( \ - typename IterType:: iterator \ + typename MainType:: iterator \ IterVar=IterObj.end(); \ IterVar>0; --IterVar \ ) -#define __for_it_rc(IterType, IterObj, IterVar) \ +#define __for_it_rc(MainType, IterObj, IterVar) \ for ( \ - typename IterType::const_iterator \ + typename MainType::const_iterator \ IterVar=IterObj.cend(); \ IterVar>0; --IterVar \ ) -#define _FOR_ITER_EASY_START0(IterType, IterObj, IterVar, SizeVar) \ +#define _FOR_ITER_EASY_START0(MainType, IterObj, IterVar, SizeVar) \ { \ - typedef IterType::TypeSize IterTypeSize ; \ + typedef MainType::TypeSize IterTypeSize ; \ ZNsMain::IterEasyID IterVar = IterObj.ItHID(); \ \ for(IterTypeSize SizeVar=0; SizeVar