summaryrefslogtreecommitdiffstats
path: root/Platforms
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-12-20 05:14:34 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-12-20 05:14:34 +0000
commiteb3ebcd9f568cfe6abb5c03fab0bb3af46be2704 (patch)
tree3d365b1081bef7ab9d01efa679f6401bcdb9bbb9 /Platforms
parentAdded install rules for third-party libraries (diff)
downloadDiligentCore-eb3ebcd9f568cfe6abb5c03fab0bb3af46be2704.tar.gz
DiligentCore-eb3ebcd9f568cfe6abb5c03fab0bb3af46be2704.zip
Fixed issue with WindowsFileSystem::CreateDirectory and WindowsFileSystem::DeleteFile; few updates to Vector implementation
Diffstat (limited to 'Platforms')
-rw-r--r--Platforms/Win32/src/Win32FileSystem.cpp11
1 files changed, 5 insertions, 6 deletions
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 <Shlwapi.h>
#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 <Windows.h>
-#include "Shlwapi.h"
+#include <Shlwapi.h>
#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);
}