diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 8708726..cf90aa6 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -470,17 +470,17 @@ using namespace std; #define __forD1(i, LoopCount) for(i=1; i<=LoopCount; ++i) -#define __for_iter( IterClass, IterObj, IterVar) \ +#define __for_iter( IterClass, IterObj, IterVar) \ for ( \ - IterClass::iterator IterVar=IterObj.begin(); \ - IterVar<=IterObj.size(); \ - ++IterVar \ + typename IterClass:: iterator \ + IterVar=IterObj.begin(); \ + IterVar<=IterObj.size(); ++IterVar \ ) -#define __for_iterc(IterClass, IterObj, IterVar) \ +#define __for_iterc(IterClass, IterObj, IterVar) \ for ( \ - IterClass::const_iterator IterVar=IterObj.begin(); \ - IterVar<=IterObj.size(); \ - ++IterVar \ + typename IterClass::const_iterator \ + IterVar=IterObj.begin(); \ + IterVar<=IterObj.size(); ++IterVar \ ) diff --git a/ZCppMainTest/ZtCBaseList_000.cpp b/ZCppMainTest/ZtCBaseList_000.cpp index 19fe813..c051faa 100644 --- a/ZCppMainTest/ZtCBaseList_000.cpp +++ b/ZCppMainTest/ZtCBaseList_000.cpp @@ -111,7 +111,12 @@ namespace ZNsMain >; /////////////////////////////////////////////////////////////////////////// - typedef typename ZCBaseList::ZCLink ZCLink; + /*****************************************************************************/ + typedef typename ZCBaseList::ZCLink ZCLink ; + /*****************************************************************************/ + typedef typename ZCBaseList::iterator iterator ; + typedef typename ZCBaseList::const_iterator const_iterator; + /*****************************************************************************/ public : @@ -216,8 +221,13 @@ namespace ZNsMain >; /////////////////////////////////////////////////////////////////////////// - typedef typename ZCBaseList::ZCLink ZCLink; + /*****************************************************************************/ + typedef typename ZCBaseList::ZCLink ZCLink ; + /*****************************************************************************/ + typedef typename ZCBaseList::iterator iterator ; + typedef typename ZCBaseList::const_iterator const_iterator; + /*****************************************************************************/ public : _VT_ ZTypLong capacity() const @@ -669,6 +679,12 @@ namespace ZNsMain cout<<"*****************************************************"<