From 4be0e5fd77d90c2a6ddfb5a017b058c1c7df78e1 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 18 Jun 2020 09:52:55 +0800 Subject: [PATCH] support the new "BaseString::valueOf" --- src/Win/EnumVolume.cpp | 4 ++-- src/Win/ExternalModule.cpp | 4 ++-- src/Win/File.cpp | 2 +- src/Win/Semaphore.cpp | 2 +- src/Win/Thread.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Win/EnumVolume.cpp b/src/Win/EnumVolume.cpp index 5d3ae3e..7fae473 100644 --- a/src/Win/EnumVolume.cpp +++ b/src/Win/EnumVolume.cpp @@ -63,7 +63,7 @@ namespace hgl } else { - LOG_PROBLEM(U16_TEXT("Get <")+UTF16String(path_name)+U16_TEXT("> info failed!Windows error code: ")+UTF16String((uint)GetLastError())); + LOG_PROBLEM(U16_TEXT("Get <")+UTF16String(path_name)+U16_TEXT("> info failed!Windows error code: ")+UTF16String::valueOf((uint)GetLastError())); } if(GetDiskFreeSpaceExW(path_name, @@ -75,7 +75,7 @@ namespace hgl } else { - LOG_PROBLEM(U16_TEXT("Get disk free space <")+UTF16String(path_name)+U16_TEXT("> data failed,Windows error code: ")+UTF16String((uint)GetLastError())); + LOG_PROBLEM(U16_TEXT("Get disk free space <")+UTF16String(path_name)+U16_TEXT("> data failed,Windows error code: ")+UTF16String::valueOf((uint)GetLastError())); } count++; diff --git a/src/Win/ExternalModule.cpp b/src/Win/ExternalModule.cpp index c817b79..15e2376 100644 --- a/src/Win/ExternalModule.cpp +++ b/src/Win/ExternalModule.cpp @@ -16,7 +16,7 @@ namespace hgl FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,nullptr,dw, MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),str,0,nullptr); - LOG_ERROR(OS_TEXT("LoadModule <")+OSString(filename)+OS_TEXT("> error! os info: ")+OSString(dw)+OSString::charOf(',')+str); + LOG_ERROR(OS_TEXT("LoadModule <")+OSString(filename)+OS_TEXT("> error! os info: ")+OSString::valueOf(dw)+OSString::charOf(',')+str); return(nullptr); } @@ -43,7 +43,7 @@ namespace hgl FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,nullptr,dw, MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),str,0,nullptr); - LOG_ERROR(L"LoadModule <"+UTF16String(name)+L"> error! os info: "+UTF16String(dw)+UTF16String::charOf(L',')+str); + LOG_ERROR(L"LoadModule <"+UTF16String(name)+L"> error! os info: "+UTF16String::valueOf(dw)+UTF16String::charOf(L',')+str); return(false); } diff --git a/src/Win/File.cpp b/src/Win/File.cpp index e99e04b..3f084d9 100644 --- a/src/Win/File.cpp +++ b/src/Win/File.cpp @@ -162,7 +162,7 @@ namespace hgl const uint win_error=GetLastError(); - LOG_PROBLEM(OS_TEXT("Create Directory <")+OSString(name)+OS_TEXT("> failed,errno: ")+OSString(win_error)); + LOG_PROBLEM(OS_TEXT("Create Directory <")+OSString(name)+OS_TEXT("> failed,errno: ")+OSString::valueOf(win_error)); return(false); } diff --git a/src/Win/Semaphore.cpp b/src/Win/Semaphore.cpp index a937a30..0d8df8f 100644 --- a/src/Win/Semaphore.cpp +++ b/src/Win/Semaphore.cpp @@ -14,7 +14,7 @@ namespace hgl ptr=CreateSemaphore(nullptr,0,max_count,nullptr); if(!ptr) - LOG_ERROR(OS_TEXT("CreateSemaphore error,max_count=")+OSString(max_count)); + LOG_ERROR(OS_TEXT("CreateSemaphore error,max_count=")+OSString::valueOf(max_count)); } Semaphore::~Semaphore() diff --git a/src/Win/Thread.cpp b/src/Win/Thread.cpp index 43428db..e12fa9b 100644 --- a/src/Win/Thread.cpp +++ b/src/Win/Thread.cpp @@ -21,7 +21,7 @@ namespace hgl if(!tp) { exit_lock.Unlock(); - LOG_ERROR(OS_TEXT("Create Thread failed,Windows ErrorCode: ")+OSString((uint)GetLastError())); + LOG_ERROR(OS_TEXT("Create Thread failed,Windows ErrorCode: ")+OSString::valueOf((uint)GetLastError())); return(false); }