From 4c696582be29baa66d3444b845b837f32b034755 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Wed, 28 Dec 2022 17:14:33 +0800 Subject: [PATCH] disabled MergetFilename function at other OS. --- inc/hgl/filesystem/Filename.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inc/hgl/filesystem/Filename.h b/inc/hgl/filesystem/Filename.h index 62998a4..d1c5dd0 100644 --- a/inc/hgl/filesystem/Filename.h +++ b/inc/hgl/filesystem/Filename.h @@ -110,7 +110,7 @@ namespace hgl { String fullname; - if(pathname.GetLastChar()==directory_separator_char) //结尾有分隔符 + if(pathname.GetLastChar()==directory_separator_char) //结尾有分隔符 { if(filename.GetFirstChar()==directory_separator_char) //开头有分隔符 { @@ -340,8 +340,10 @@ namespace hgl inline UTF8String MergeFilename(const UTF8String &pathname,const UTF8String &filename) ///<组合路径名与文件名 {return MergeFilename(pathname,filename,HGL_DIRECTORY_SEPARATOR,HGL_DIRECTORY_SEPARATOR_U8STR);} + #if HGL_OS == HGL_OS_Windows inline WideString MergeFilename(const WideString &pathname,const WideString &filename) ///<组合路径名与文件名 {return MergeFilename(pathname,filename,L'\\',L"\\");} + #endif//HGL_OS == HGL_OS_Windows OSString FixFilename(const OSString &filename); ///<修正部分文件名问题 }//namespace filesystem