From eb3ebcd9f568cfe6abb5c03fab0bb3af46be2704 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Wed, 19 Dec 2018 21:14:34 -0800 Subject: Fixed issue with WindowsFileSystem::CreateDirectory and WindowsFileSystem::DeleteFile; few updates to Vector implementation --- Platforms/Win32/src/Win32FileSystem.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Platforms') diff --git a/Platforms/Win32/src/Win32FileSystem.cpp b/Platforms/Win32/src/Win32FileSystem.cpp index 2fb9a140..ad995c6d 100644 --- a/Platforms/Win32/src/Win32FileSystem.cpp +++ b/Platforms/Win32/src/Win32FileSystem.cpp @@ -21,7 +21,6 @@ * of the possibility of such damages. */ -#include #include "Win32FileSystem.h" #include "Errors.h" #include "../../Common/interface/StringTools.h" @@ -31,20 +30,20 @@ // Windows.h defines CreateDirectory and DeleteFile as macros. // So we need to do some tricks to avoid name mess. -bool CreateDirectoryImpl( const Diligent::Char *strPath ); +static bool CreateDirectoryImpl( const Diligent::Char *strPath ); bool WindowsFileSystem::CreateDirectory( const Diligent::Char *strPath ) { return CreateDirectoryImpl(strPath); } -void DeleteFileImpl( const Diligent::Char *strPath ); +static void DeleteFileImpl( const Diligent::Char *strPath ); void WindowsFileSystem::DeleteFile( const Diligent::Char *strPath ) { DeleteFileImpl(strPath); } #include -#include "Shlwapi.h" +#include #pragma comment(lib, "Shlwapi.lib") using namespace Diligent; @@ -122,7 +121,7 @@ bool WindowsFileSystem::FileExists( const Char *strFilePath ) return Exists; } -bool CreateDirectoryImpl( const Char *strPath ) +static bool CreateDirectoryImpl( const Char *strPath ) { // Test all parent directories std::string DirectoryPath = strPath; @@ -174,7 +173,7 @@ void WindowsFileSystem::ClearDirectory( const Char *strPath ) } -void DeleteFileImpl( const Char *strPath ) +static void DeleteFileImpl( const Char *strPath ) { DeleteFileA(strPath); } -- cgit v1.2.3