diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2016-02-10 12:36:05 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2016-02-10 12:36:05 +0000 |
| commit | 4b52020304f2a193a32f031624c89c58e03f5d1d (patch) | |
| tree | 9e546961f5910a6c37846c7552ebaa89f6a2e03d /plugins/Db_autobackups | |
| parent | f1c735f22c3f3d6317d86d890ad74d63f0bbf558 (diff) | |
db_autobackups: VS2010 compilation fix(?)
git-svn-id: http://svn.miranda-ng.org/main/trunk@16261 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Db_autobackups')
| -rw-r--r-- | plugins/Db_autobackups/src/backup.cpp | 2 | ||||
| -rw-r--r-- | plugins/Db_autobackups/src/stdafx.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Db_autobackups/src/backup.cpp b/plugins/Db_autobackups/src/backup.cpp index f10d2d3806..e75f886df4 100644 --- a/plugins/Db_autobackups/src/backup.cpp +++ b/plugins/Db_autobackups/src/backup.cpp @@ -90,7 +90,7 @@ bool MakeZip_Dir(LPCSTR szDir, LPCTSTR szDest, LPCSTR /* szDbName */, HWND progr for (auto it = fs::recursive_directory_iterator(fs::path(szDir)); it != fs::recursive_directory_iterator(); ++it)
{
const auto& file = it->path();
- if (!fs::is_directory(file) && !strstr(std::string(file).c_str(), _T2A(szDest)))
+ if (!fs::is_directory(file) && !strstr(file.file_string().c_str(), _T2A(szDest)))
{
std::string filepath = file;
std::string rpath = filepath.substr(filepath.find(szDir) + mir_strlen(szDir) + 1);
diff --git a/plugins/Db_autobackups/src/stdafx.h b/plugins/Db_autobackups/src/stdafx.h index a415228ad9..f00a90cb64 100644 --- a/plugins/Db_autobackups/src/stdafx.h +++ b/plugins/Db_autobackups/src/stdafx.h @@ -8,10 +8,10 @@ #include <time.h>
#include <filesystem>
#include <vector>
-#if defined(_MSC_VER) && (_MSC_VER >= 1800) -namespace fs = std::tr2::sys; -#else -namespace fs = std::experimental::filesystem; +#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+ namespace fs = std::tr2::sys;
+#else
+ namespace fs = std::experimental::filesystem;
#endif
#include <newpluginapi.h>
|