From 59a8cb370810d839036c6fc3635637aa2581a8c7 Mon Sep 17 00:00:00 2001 From: sauron Date: Tue, 7 Oct 2025 15:40:40 +0900 Subject: [PATCH] commit 2025-10-07 15:40 edit a bit ZCppMain/ZtCLinkList.H --- ZCppMain/ZMainHead.H | 18 +++++++++--------- ZCppMain/ZtCLinkList.H | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index b7643de..f6143ce 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -781,25 +781,25 @@ namespace ZNsMain namespace ZNsEnum*/ - template ZTypIntE ZftGetCompareCode + template ZTypIntE ZftGetCompareCode ( - const ZtpChar* ZApcLeft , ZtpiLength ZAiLenLeft , - const ZtpChar* ZApcRight, ZtpiLength zAiLenRight + const TTyChar* ZApcLeft , TTyiLength ZAiLenLeft , + const TTyChar* ZApcRight, TTyiLength zAiLenRight ) /*######################################################################*/ { if(ZAiLenLeft<1 && zAiLenRight<1) return ZNsEnum::ZECompareResult_Equal; - ZtpiLength ViLoopCnt = + TTyiLength ViLoopCnt = (ZAiLenLeft<=zAiLenRight ? ZAiLenLeft : zAiLenRight); - __for0(ZtpiLength, i, ViLoopCnt) + __for0(TTyiLength, i, ViLoopCnt) { if(ZApcLeft[i] > ZApcRight[i]) return ZNsEnum::ZECompareResult_More; if(ZApcLeft[i] < ZApcRight[i]) return ZNsEnum::ZECompareResult_Less; }/* - __for0(ZtpiLength, i, ViLoopCnt)*/ + __for0(TTyiLength, i, ViLoopCnt)*/ if(ZAiLenLeft==zAiLenRight) return ZNsEnum::ZECompareResult_Equal; if(ZAiLenLeft> zAiLenRight) return ZNsEnum::ZECompareResult_More ; @@ -807,10 +807,10 @@ namespace ZNsMain return ZNsEnum::ZECompareResult_Equal; }/* - template ZTypIntE ZftGetCompareCode + template ZTypIntE ZftGetCompareCode ( - const ZtpChar* ZApcLeft , ZtpiLength ZAiLenLeft , - const ZtpChar* ZApcRight, ZtpiLength zAiLenRight + const TTyChar* ZApcLeft , TTyiLength ZAiLenLeft , + const TTyChar* ZApcRight, TTyiLength zAiLenRight ) /*######################################################################*/ diff --git a/ZCppMain/ZtCLinkList.H b/ZCppMain/ZtCLinkList.H index ca45f55..2e7ee40 100644 --- a/ZCppMain/ZtCLinkList.H +++ b/ZCppMain/ZtCLinkList.H @@ -1306,14 +1306,14 @@ namespace ZNsMain } else // ml_LinkSize>=1 { - ZCLink::JoinLink(mp_TailLink, rhs.mp_HeadLink ); - ZCLink::MakeRing(mp_HeadLink, rhs.mp_TailLink ); + ZCLink::JoinLink(mp_TailLink, rhs.mp_HeadLink); + ZCLink::MakeRing(mp_HeadLink, rhs.mp_TailLink); mp_TailLink = rhs.mp_TailLink ; }/* else // ml_LinkSize>=1*/ - ml_LinkSize += rhs.ml_LinkSize; + ml_LinkSize += rhs.ml_LinkSize; rhs.mp_HeadLink=0; rhs.mp_TailLink=0;