From 9191dcb73ca0bdc9545a94dfbed4581a84c7c7d2 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Sat, 11 Jul 2020 16:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8GNU=E7=BC=96=E8=AF=91=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=A0=B9=E6=8D=AE=E7=B3=BB=E7=BB=9F=E9=A2=84=E7=BD=AE?=
 =?UTF-8?q?=E5=AE=8F=EF=BC=8C=E6=AD=A3=E7=A1=AE=E8=AF=86=E5=88=AB=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=94=AF=E6=8C=81char8=5Ft=E3=80=82=EF=BC=88=E6=B3=A8?=
 =?UTF-8?q?=EF=BC=9A=E4=BB=85=E6=A0=B9=E6=8D=AE=E6=96=87=E6=A1=A3=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=8C=E5=BE=85LINUX=E4=B8=8B=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/hgl/log/LogInfo.h                   | 11 ++++++-----
 inc/hgl/platform/compiler/DataTypeGNU.h |  7 +++++++
 inc/hgl/platform/compiler/GNU.h         |  8 --------
 inc/hgl/platform/compiler/Microsoft.h   |  5 +++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/inc/hgl/log/LogInfo.h b/inc/hgl/log/LogInfo.h
index 873cd7d..e058019 100644
--- a/inc/hgl/log/LogInfo.h
+++ b/inc/hgl/log/LogInfo.h
@@ -34,11 +34,12 @@ namespace hgl
             std::cout<<(char *)str.c_str()<<std::endl;
         }
 
-        // 对于不支持C++20的编译器还得用宏处理一下
-        // inline  void Log(LogLevel ll,const AnsiString &str)
-        // {
-        //     std::cout<<str.c_str()<<std::endl;
-        // }
+        #ifdef HGL_SUPPORT_CHAR8_T
+        inline  void Log(LogLevel ll,const AnsiString &str)
+        {
+            std::cout<<str.c_str()<<std::endl;
+        }
+        #endif//HGL_SUPPORT_CHAR8_T
 
         inline  void DebugLog(LogLevel ll,const UTF16String &str,const char *filename,int line,const char *funcname)
         {
diff --git a/inc/hgl/platform/compiler/DataTypeGNU.h b/inc/hgl/platform/compiler/DataTypeGNU.h
index 18b403a..7d590bd 100644
--- a/inc/hgl/platform/compiler/DataTypeGNU.h
+++ b/inc/hgl/platform/compiler/DataTypeGNU.h
@@ -17,5 +17,12 @@ namespace hgl
 
     using float32   =float;
     using float64   =double;
+
+#if defined(__cpp_char8_t)||defined(__cpp_lib_char8_t)
+    #define HGL_SUPPORT_CHAR8_T
+    using u8char = char8_t;
+#else
+    using u8char = char;
+#endif
 }//namespace hgl
 #endif//HGL_DATATYPE_GNU_INCLUDE
diff --git a/inc/hgl/platform/compiler/GNU.h b/inc/hgl/platform/compiler/GNU.h
index 3f0d906..e15facd 100644
--- a/inc/hgl/platform/compiler/GNU.h
+++ b/inc/hgl/platform/compiler/GNU.h
@@ -72,14 +72,6 @@
 
 #endif//__GNUC__
 
-// 假设 GCC 从 11 开始正式支持 char8_t( 这个我手头没有 11 ，不确定 )
-#if __GNUC__ >= 11
-    using u8char = char8_t;
-#else
-    using u8char = char;
-#endif
-
-
 #define HGL_THREAD_LOCAL_STORAGE        __thread                                //线程本地储存
 //--------------------------------------------------------------------------------------------------
 #define HGL_LIB_FRONT   HGL_LIB_OS "_" HGL_LIB_COMPILER_NAME "_" HGL_LIB_DEBUG_NAME "_"
diff --git a/inc/hgl/platform/compiler/Microsoft.h b/inc/hgl/platform/compiler/Microsoft.h
index b44740e..bceeac8 100644
--- a/inc/hgl/platform/compiler/Microsoft.h
+++ b/inc/hgl/platform/compiler/Microsoft.h
@@ -21,9 +21,10 @@
 #define HGL_THREAD_LOCAL_STORAGE        __declspec(thread)                              //线程本地储存
 //--------------------------------------------------------------------------------------------------
 #if _MSVC_LANG>=201704L         //C++20
-using u8char    =char8_t;
+    #define HGL_SUPPORT_CHAR8_T
+    using u8char    =char8_t;
 #else
-using u8char    =char;
+    using u8char    =char;
 #endif
 
 #define HGL_FMT_I64            "%I64d"