From 4485241a49452107911f40edc7f4636c03a5ffb4 Mon Sep 17 00:00:00 2001 From: sauron Date: Sat, 27 Sep 2025 10:57:52 +0900 Subject: [PATCH] commit 2025-09-27 10:57 bug fix in DeleteHeap() : ZCppMain/ZtCObjList.H --- ZCppMain/ZtCObjList.H | 7 ++++--- ZCppMain/ZtCSimList.H | 7 ++++--- ZCppMainTest/ZtCObjList_000.cpp | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index e87035b..f7e0d1d 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -578,9 +578,10 @@ namespace ZNsMain { if(ml_UseSize<1) return ; - ZCLink* VP_DelLink = mp_NoUseHead; + ZCLink* VP_DelLink = mp_NoUseHead; + TypeSize VI_UseSize = ml_UseSize ; - do /*+++++++++++++++++++++++++++*/ + do /*++++++++++++++++++++++++++++*/ { mp_NoUseHead = mp_NoUseHead->GetNextPtr() ; @@ -589,7 +590,7 @@ namespace ZNsMain VP_DelLink = mp_NoUseHead ; } - while(--ml_UseSize>0); /*+++++++*/ + while(--VI_UseSize>0); /*++++++++*/ ml_AllSize -= ml_UseSize; ml_UseSize = 0 ; diff --git a/ZCppMain/ZtCSimList.H b/ZCppMain/ZtCSimList.H index 19d1966..3cb014a 100644 --- a/ZCppMain/ZtCSimList.H +++ b/ZCppMain/ZtCSimList.H @@ -579,9 +579,10 @@ namespace ZNsMain { if(ml_UseSize<1) return ; - ZCLink* VP_DelLink = mp_NoUseHead; + ZCLink* VP_DelLink = mp_NoUseHead; + TypeSize VI_UseSize = ml_UseSize ; - do /*+++++++++++++++++++++++++++*/ + do /*++++++++++++++++++++++++++++*/ { mp_NoUseHead = mp_NoUseHead->GetNextPtr() ; @@ -590,7 +591,7 @@ namespace ZNsMain VP_DelLink = mp_NoUseHead ; } - while(--ml_UseSize>0); /*+++++++*/ + while(--VI_UseSize>0); /*++++++++*/ ml_AllSize -= ml_UseSize; ml_UseSize = 0 ; diff --git a/ZCppMainTest/ZtCObjList_000.cpp b/ZCppMainTest/ZtCObjList_000.cpp index 3c24878..b488134 100644 --- a/ZCppMainTest/ZtCObjList_000.cpp +++ b/ZCppMainTest/ZtCObjList_000.cpp @@ -187,6 +187,28 @@ namespace ZNsMain cout<<"# list10 IterElement after list10 = list11"<