From c613f0df8a6969f3d84fd6d903d3327a8dd5dad2 Mon Sep 17 00:00:00 2001 From: sauron Date: Sat, 27 Sep 2025 09:20:03 +0900 Subject: [PATCH] commit 2025-09-27 09:19 refine a bit DeleteHeap(TypeSize AI_DelCnt) : ZCppMain/ZtCObjList.H --- ZCppMain/ZtCObjList.H | 7 ++----- ZCppMain/ZtCSimList.H | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index 2f90bc7..e87035b 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -603,11 +603,11 @@ namespace ZNsMain { if(ml_UseSize<1) return 0; if(AI_DelCnt <1) return 0; - if(AI_DelCnt > size()) + if(AI_DelCnt >= size()) { AI_DelCnt=size(); DeleteHeap(); return AI_DelCnt; }/* - if(AI_DelCnt > size())*/ + if(AI_DelCnt >= size())*/ TypeSize VI_DelCntCopy = AI_DelCnt ; @@ -627,9 +627,6 @@ namespace ZNsMain ml_AllSize -= AI_DelCnt; ml_UseSize -= AI_DelCnt; - if(ml_UseSize<1) - mp_NoUseHead = mp_NoUseTail = 0 ; - return AI_DelCnt; }/* TypeSize DeleteHeap(TypeSize AI_DelCnt)*/ diff --git a/ZCppMain/ZtCSimList.H b/ZCppMain/ZtCSimList.H index 4be7b91..19d1966 100644 --- a/ZCppMain/ZtCSimList.H +++ b/ZCppMain/ZtCSimList.H @@ -604,11 +604,11 @@ namespace ZNsMain { if(ml_UseSize<1) return 0; if(AI_DelCnt <1) return 0; - if(AI_DelCnt > size()) + if(AI_DelCnt >= size()) { AI_DelCnt=size(); DeleteHeap(); return AI_DelCnt; }/* - if(AI_DelCnt > size())*/ + if(AI_DelCnt >= size())*/ TypeSize VI_DelCntCopy = AI_DelCnt ; @@ -628,9 +628,6 @@ namespace ZNsMain ml_AllSize -= AI_DelCnt; ml_UseSize -= AI_DelCnt; - if(ml_UseSize<1) - mp_NoUseHead = mp_NoUseTail = 0 ; - return AI_DelCnt; }/* TypeSize DeleteHeap(TypeSize AI_DelCnt)*/