port to C17/C++20

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);

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;}

inc/hgl/util/plist/PAttrib.h

@@ -280,10 +280,10 @@ namespace hgl
             return pa_map.Add(name,attr);
         }
 
-        bool Add(const PString &str)
+        //bool Add(const PString &str)
-        {
+        //{
-            return Add(pa_name,str);
+        //    return Add(pa_name,str);
-        }
+        //}
 
         PAttribBase<C> *Get(const PString &name){return GetObjectFromList(pa_map,name);}
 
@@ -298,7 +298,7 @@ namespace hgl
         };
     };//template<typename C> class PAttribSet
 
-    using UTF8PAttribSet    =PAttribSet<char>;
+    using UTF8PAttribSet    =PAttribSet<u8char>;
     using UTF16PAttribSet   =PAttribSet<u16char>;
     using WidePAttribSet    =PAttribSet<wchar_t>;
     using OSPAttribSet      =PAttribSet<os_char>;

inc/hgl/util/xml/ElementParseCreater.h

@@ -17,7 +17,7 @@ namespace hgl
 
         protected:
 
-            Map<AnsiString,ElementCreater *> ecs_map;
+            Map<UTF8String,ElementCreater *> ecs_map;
 
             virtual ElementCreater *GetSubElementCreater(const UTF8String &sub_name);
 
@@ -133,7 +133,7 @@ namespace hgl
         {
             Stack<ElementCreater *> ecs_stack;
 
-            Map<AnsiString,ElementCreater *> ecs_map;
+            Map<UTF8String,ElementCreater *> ecs_map;
 
             ElementCreater *cur_ec;
 

src/csv/CSVOutputStream.cpp

@@ -8,7 +8,7 @@ namespace hgl
 {
     namespace util
     {
-        CSVOutputStream<char> *CreateCSVOutputToUTF8File(const OSString &filename,const u8char fields_terminated_char,const u8char enclosed_char)
+        CSVOutputStream<u8char> *CreateCSVOutputToUTF8File(const OSString &filename,const u8char fields_terminated_char,const u8char enclosed_char)
         {
             io::FileOutputStream *fos=io::CreateFileOutputStream(filename);
 

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;}

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;}

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;}

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;}

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;}

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;}

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)

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<char>(ai->value.c_str(),value):false);
+            return(ai?stob<u8char>(ai->value.c_str(),value):false);
         }
 
         const bool ElementParseKV::GetHexStr(const UTF8String &name,uint8 *data)

src/xml/XMLParseClass.cpp

@@ -94,8 +94,8 @@ namespace hgl
 
                 while(*atts)
                 {
-                    flag=*atts;++atts;
+                    flag=(u8char *)(*atts);++atts;
-                    info=*atts;++atts;
+                    info=(u8char *)(*atts);++atts;
 
                     ep->Attr(flag,info);
                 }