From 259f0ef40c46c7cb6fadc4f9402e100c352df9d9 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 25 Jul 2024 02:59:53 +0800 Subject: [PATCH] port to C17/C++20 --- inc/hgl/util/hash/Hash.h | 2 +- inc/hgl/util/hash/SHA1LE.h | 2 +- inc/hgl/util/plist/PAttrib.h | 10 +++++----- inc/hgl/util/xml/ElementParseCreater.h | 4 ++-- src/csv/CSVOutputStream.cpp | 2 +- src/hash/md4.cpp | 2 +- src/hash/md5.cpp | 2 +- src/hash/sha1.cpp | 2 +- src/hash/sha256.cpp | 2 +- src/hash/sha512.cpp | 2 +- src/hash/xxHash3.cpp | 8 ++++---- src/json/JsonTool.cpp | 2 +- src/xml/ElementParseKV.cpp | 8 ++++---- src/xml/XMLParseClass.cpp | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/inc/hgl/util/hash/Hash.h b/inc/hgl/util/hash/Hash.h index 9d5122f..6578be7 100644 --- a/inc/hgl/util/hash/Hash.h +++ b/inc/hgl/util/hash/Hash.h @@ -266,7 +266,7 @@ namespace hgl const int hash_bytes=hash_code_bytes[(size_t)ha]; uint8 *hash_code=new uint8[hash_bytes]; - char *hash_code_str=new char[1+(hash_bytes<<1)]; + u8char *hash_code_str=new u8char[1+(hash_bytes<<1)]; h->Init(); h->Update(data,size); diff --git a/inc/hgl/util/hash/SHA1LE.h b/inc/hgl/util/hash/SHA1LE.h index fb6589f..2428e2c 100644 --- a/inc/hgl/util/hash/SHA1LE.h +++ b/inc/hgl/util/hash/SHA1LE.h @@ -37,7 +37,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="SHA1LE";} + void GetName(UTF8String &str)const override{str=U8_TEXT("SHA1LE");} void GetName(UTF16String &str)const override{str=U16_TEXT("SHA1LE");} const int GetHashBytes()const override {return DIGEST_SIZE;} diff --git a/inc/hgl/util/plist/PAttrib.h b/inc/hgl/util/plist/PAttrib.h index 1ee9a93..90be964 100644 --- a/inc/hgl/util/plist/PAttrib.h +++ b/inc/hgl/util/plist/PAttrib.h @@ -280,10 +280,10 @@ namespace hgl return pa_map.Add(name,attr); } - bool Add(const PString &str) - { - return Add(pa_name,str); - } + //bool Add(const PString &str) + //{ + // return Add(pa_name,str); + //} PAttribBase *Get(const PString &name){return GetObjectFromList(pa_map,name);} @@ -298,7 +298,7 @@ namespace hgl }; };//template class PAttribSet - using UTF8PAttribSet =PAttribSet; + using UTF8PAttribSet =PAttribSet; using UTF16PAttribSet =PAttribSet; using WidePAttribSet =PAttribSet; using OSPAttribSet =PAttribSet; diff --git a/inc/hgl/util/xml/ElementParseCreater.h b/inc/hgl/util/xml/ElementParseCreater.h index 7c6b1b4..9c31665 100644 --- a/inc/hgl/util/xml/ElementParseCreater.h +++ b/inc/hgl/util/xml/ElementParseCreater.h @@ -17,7 +17,7 @@ namespace hgl protected: - Map ecs_map; + Map ecs_map; virtual ElementCreater *GetSubElementCreater(const UTF8String &sub_name); @@ -133,7 +133,7 @@ namespace hgl { Stack ecs_stack; - Map ecs_map; + Map ecs_map; ElementCreater *cur_ec; diff --git a/src/csv/CSVOutputStream.cpp b/src/csv/CSVOutputStream.cpp index 79ab02e..ee93b65 100644 --- a/src/csv/CSVOutputStream.cpp +++ b/src/csv/CSVOutputStream.cpp @@ -8,7 +8,7 @@ namespace hgl { namespace util { - CSVOutputStream *CreateCSVOutputToUTF8File(const OSString &filename,const u8char fields_terminated_char,const u8char enclosed_char) + CSVOutputStream *CreateCSVOutputToUTF8File(const OSString &filename,const u8char fields_terminated_char,const u8char enclosed_char) { io::FileOutputStream *fos=io::CreateFileOutputStream(filename); diff --git a/src/hash/md4.cpp b/src/hash/md4.cpp index f453d49..a2b4483 100644 --- a/src/hash/md4.cpp +++ b/src/hash/md4.cpp @@ -150,7 +150,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="MD4";} + void GetName(UTF8String &str)const override{str=U8_TEXT("MD4");} void GetName(UTF16String &str)const override{str=U16_TEXT("MD4");} const int GetHashBytes()const override{return DIGEST_SIZE;} diff --git a/src/hash/md5.cpp b/src/hash/md5.cpp index 7b240fa..f1ea188 100644 --- a/src/hash/md5.cpp +++ b/src/hash/md5.cpp @@ -181,7 +181,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="MD5";} + void GetName(UTF8String &str)const override{str=U8_TEXT("MD5");} void GetName(UTF16String &str)const override{str=U16_TEXT("MD5");} const int GetHashBytes()const override{return DIGEST_SIZE;} diff --git a/src/hash/sha1.cpp b/src/hash/sha1.cpp index 949a60e..9a71d6a 100644 --- a/src/hash/sha1.cpp +++ b/src/hash/sha1.cpp @@ -149,7 +149,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="SHA1";} + void GetName(UTF8String &str)const override{str=U8_TEXT("SHA1");} void GetName(UTF16String &str)const override{str=U16_TEXT("SHA1");} const int GetHashBytes()const override{return DIGEST_SIZE;} diff --git a/src/hash/sha256.cpp b/src/hash/sha256.cpp index 69d06bd..b627d39 100644 --- a/src/hash/sha256.cpp +++ b/src/hash/sha256.cpp @@ -91,7 +91,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="SHA256";} + void GetName(UTF8String &str)const override{str=U8_TEXT("SHA256");} void GetName(UTF16String &str)const override{str=U16_TEXT("SHA256");} const int GetHashBytes()const override{return DIGEST_SIZE;} diff --git a/src/hash/sha512.cpp b/src/hash/sha512.cpp index b0b5ee0..a3b92d5 100644 --- a/src/hash/sha512.cpp +++ b/src/hash/sha512.cpp @@ -163,7 +163,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="SHA512";} + void GetName(UTF8String &str)const override{str=U8_TEXT("SHA512");} void GetName(UTF16String &str)const override{str=U16_TEXT("SHA512");} const int GetHashBytes()const override{return DIGEST_SIZE;} diff --git a/src/hash/xxHash3.cpp b/src/hash/xxHash3.cpp index 5603674..7970bfb 100644 --- a/src/hash/xxHash3.cpp +++ b/src/hash/xxHash3.cpp @@ -23,7 +23,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="XXH32";} + void GetName(UTF8String &str)const override{str=U8_TEXT("XXH32");} void GetName(UTF16String &str)const override{str=U16_TEXT("XXH32");} const int GetHashBytes()const override{return 4;} @@ -59,7 +59,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="XXH64";} + void GetName(UTF8String &str)const override{str=U8_TEXT("XXH64");} void GetName(UTF16String &str)const override{str=U16_TEXT("XXH64");} const int GetHashBytes()const override{return 8;} @@ -95,7 +95,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="XXH3_64bits";} + void GetName(UTF8String &str)const override{str=U8_TEXT("XXH3_64bits");} void GetName(UTF16String &str)const override{str=U16_TEXT("XXH3_64bits");} const int GetHashBytes()const override{return 8;} @@ -131,7 +131,7 @@ namespace hgl public: - void GetName(UTF8String &str)const override{str="XXH3_128bits";} + void GetName(UTF8String &str)const override{str=U8_TEXT("XXH3_128bits");} void GetName(UTF16String &str)const override{str=U16_TEXT("XXH3_128bits");} const int GetHashBytes()const override{return 16;} diff --git a/src/json/JsonTool.cpp b/src/json/JsonTool.cpp index 9df47b7..23c893d 100644 --- a/src/json/JsonTool.cpp +++ b/src/json/JsonTool.cpp @@ -11,7 +11,7 @@ namespace hgl { const UTF8String GetJsoncppVersion() { - return UTF8String(JSONCPP_VERSION_STRING); + return UTF8String((const u8char *)JSONCPP_VERSION_STRING); } bool JsonToString(const Json::Value &jv_root,UTF8String &str,OSString &error_info) diff --git a/src/xml/ElementParseKV.cpp b/src/xml/ElementParseKV.cpp index a1182ac..5983e07 100644 --- a/src/xml/ElementParseKV.cpp +++ b/src/xml/ElementParseKV.cpp @@ -9,12 +9,12 @@ namespace hgl { const int pos=attrs_map.FindPos(name); - if(pos<0)return(false); + if(pos<0)return(nullptr); return attrs_map.GetItem(pos); } - void ElementParseKV::Attr(const char *flag,const char *info) + void ElementParseKV::Attr(const u8char *flag,const u8char *info) { attrs_map.Add(flag,info); } @@ -39,7 +39,7 @@ namespace hgl return(true); } - const bool ElementParseKV::Get(const UTF8String &name,char &ch) + const bool ElementParseKV::Get(const UTF8String &name,u8char &ch) { const AttrItem *ai=GetAttrItem(name); @@ -53,7 +53,7 @@ namespace hgl { const AttrItem *ai=GetAttrItem(name); - return(ai?stob(ai->value.c_str(),value):false); + return(ai?stob(ai->value.c_str(),value):false); } const bool ElementParseKV::GetHexStr(const UTF8String &name,uint8 *data) diff --git a/src/xml/XMLParseClass.cpp b/src/xml/XMLParseClass.cpp index 76d89e2..513abe4 100644 --- a/src/xml/XMLParseClass.cpp +++ b/src/xml/XMLParseClass.cpp @@ -94,8 +94,8 @@ namespace hgl while(*atts) { - flag=*atts;++atts; - info=*atts;++atts; + flag=(u8char *)(*atts);++atts; + info=(u8char *)(*atts);++atts; ep->Attr(flag,info); }