diff --git a/ZCppMain/ZtCLoadDataBlock.H b/ZCppMain/ZtCLoadDataBlock.H index e2a34db..f8d7494 100644 --- a/ZCppMain/ZtCLoadDataBlock.H +++ b/ZCppMain/ZtCLoadDataBlock.H @@ -738,12 +738,12 @@ namespace ZNsMain public: - class ZCLoadDataBlock1 : public ZNsMain:: - ZtCLoadDataBlock + class ZCExamLoadBlock1 : public ZNsMain:: + ZtCLoadDataBlock { protected: - friend class ZNsMain::ZtCLoadDataBlock; + friend class ZNsMain::ZtCLoadDataBlock; /*////////////////////////////////////////////////////////////////////// @@ -814,16 +814,16 @@ namespace ZNsMain protected: };/* - class ZCLoadDataBlock1 : public ZNsMain:: - ZtCLoadDataBlock*/ + class ZCExamLoadBlock1 : public ZNsMain:: + ZtCLoadDataBlock*/ - class ZCLoadDataBlock2 : public ZNsMain:: - ZtCLoadDataBlock + class ZCExamLoadBlock2 : public ZNsMain:: + ZtCLoadDataBlock { protected: - friend class ZNsMain::ZtCLoadDataBlock; + friend class ZNsMain::ZtCLoadDataBlock; /*////////////////////////////////////////////////////////////////////// @@ -894,8 +894,8 @@ namespace ZNsMain protected: };/* - class ZCLoadDataBlock2 : public ZNsMain:: - ZtCLoadDataBlock*/ + class ZCExamLoadBlock2 : public ZNsMain:: + ZtCLoadDataBlock*/ public: };/* @@ -924,8 +924,8 @@ namespace ZNsMain { typedef ZNsMain ::ZtCStringBase ZCStringBase ; - ZNsExam::ZtCDummy<>::ZCLoadDataBlock1 VO_CLoadDataBlock1; - ZNsExam::ZtCDummy<>::ZCLoadDataBlock2 VO_CLoadDataBlock2; + ZNsExam::ZtCDummy<>::ZCExamLoadBlock1 VO_CLoadDataBlock1; + ZNsExam::ZtCDummy<>::ZCExamLoadBlock2 VO_CLoadDataBlock2; ZCHelpObj VO_CHelpObj ; /////////////////////////////////////////////////////////