From d8e2bde533be25a283b819cbb412213523f8648e Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 29 Nov 2019 11:59:32 +0800 Subject: [PATCH] change StdString function's name --- inc/hgl/type/StdString.h | 10 +++++----- src/CMakeLists.txt | 8 +++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/inc/hgl/type/StdString.h b/inc/hgl/type/StdString.h index 40f99d8..7b34ab6 100644 --- a/inc/hgl/type/StdString.h +++ b/inc/hgl/type/StdString.h @@ -5,30 +5,30 @@ #include #if HGL_OS == HGL_OS_Windows -inline hgl::OSString ToOSString(const std::string &str) +inline hgl::OSString std_to_os(const std::string &str) { return hgl::to_u16(str.c_str(),(int)(str.length())); } -inline std::string ToStdString(const hgl::OSString &str) +inline std::string to_std(const hgl::OSString &str) { hgl::UTF8String u8_str=hgl::to_u8(str); return std::string(u8_str.c_str()); } #else -inline hgl::OSString ToOSString(const std::string &str) +inline hgl::OSString std_to_os(const std::string &str) { return hgl::OSString(str.c_str(),str.size()); } -inline std::string ToStdString(const hgl::OSString &str) +inline std::string to_std(const hgl::OSString &str) { return std::string(str.c_str()); } #endif// -inline hgl::UTF8String ToUTF8String(const std::string &str) +inline hgl::UTF8String std_to_u8(const std::string &str) { return hgl::UTF8String(str.c_str(),int(str.size())); } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc02a9d..eefadbd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -55,18 +55,16 @@ file(GLOB BASE_LOG_SOURCE Log/*.*) SOURCE_GROUP("Log\\Header Files" FILES ${BASE_LOG_HEADER}) SOURCE_GROUP("Log\\Source Files" FILES ${BASE_LOG_SOURCE}) -add_library(CMCore STATIC #${SYSTEM_INFO_SOURCE} +add_cm_library(CMCore "CM" #${SYSTEM_INFO_SOURCE} ${TYPE_TEMPLATE_HEADER} ${BASE_TYPE_SOURCE} ${BASE_IO_SOURCE} ${BASE_FILE_SYSTEM_SOURCE} ${BASE_OTHER_SOURCE} - + ${BASE_PLUG_IN_HEADER} ${BASE_PLUG_IN_SOURCE} - + ${BASE_LOG_HEADER} ${BASE_LOG_SOURCE} ) - -set_property(TARGET CMCore PROPERTY FOLDER "CM")