From 87c3dd87c10903aa56b680e6bca53d276faad695 Mon Sep 17 00:00:00 2001 From: Julian Uy Date: Wed, 16 Apr 2025 09:51:00 -0500 Subject: [PATCH 1/2] portability: remove usage of deprecated register keyword Newer C++ standards make this an error --- tjsHashSearch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tjsHashSearch.h b/tjsHashSearch.h index 44c0b20..4a1a167 100644 --- a/tjsHashSearch.h +++ b/tjsHashSearch.h @@ -36,7 +36,7 @@ class tTJSHashFunc { const char *p = (const char*)&val; const char *plim = (const char*)&val + sizeof(T); - register tjs_uint32 ret = 0; + tjs_uint32 ret = 0; while(p Date: Wed, 16 Apr 2025 09:52:36 -0500 Subject: [PATCH 2/2] portability: explicitly specify namespaces for funcs --- tjsHashSearch.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tjsHashSearch.h b/tjsHashSearch.h index 4a1a167..d3256ba 100644 --- a/tjsHashSearch.h +++ b/tjsHashSearch.h @@ -616,27 +616,27 @@ class tTJSHashCache : public tTJSHashTable void Add(const KeyT &key, const ValueT &value) { inherited::Add(key, value); - if(GetCount() > MaxCount) + if(inherited::GetCount() > MaxCount) { - ChopLast(GetCount() - MaxCount); + inherited::ChopLast(inherited::GetCount() - MaxCount); } } void AddWithHash(const KeyT &key, tjs_uint32 hash, const ValueT &value) { inherited::AddWithHash(key, hash, value); - if(GetCount() > MaxCount) + if(inherited::GetCount() > MaxCount) { - ChopLast(GetCount() - MaxCount); + inherited::ChopLast(inherited::GetCount() - MaxCount); } } void SetMaxCount(tjs_uint maxcount) { MaxCount = maxcount; - if(GetCount() > MaxCount) + if(inherited::GetCount() > MaxCount) { - ChopLast(GetCount() - MaxCount); + inherited::ChopLast(inherited::GetCount() - MaxCount); } }