diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2016-02-10 12:50:28 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2016-02-10 12:50:28 +0000 |
| commit | 623758c88423ace8db961722e83077f30ca23109 (patch) | |
| tree | 4657559326bd2417db5a86985a5b0692ec8a64f3 /plugins/Db_autobackups/src | |
| parent | 7fc50cfdc3e7a646e88df8883e205bd78b607e1a (diff) | |
fix attempt 2
git-svn-id: http://svn.miranda-ng.org/main/trunk@16263 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Db_autobackups/src')
| -rw-r--r-- | plugins/Db_autobackups/src/backup.cpp | 4 | ||||
| -rw-r--r-- | plugins/Db_autobackups/src/stdafx.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/plugins/Db_autobackups/src/backup.cpp b/plugins/Db_autobackups/src/backup.cpp index 2967b72aa2..7d715ec7d6 100644 --- a/plugins/Db_autobackups/src/backup.cpp +++ b/plugins/Db_autobackups/src/backup.cpp @@ -92,8 +92,8 @@ bool MakeZip_Dir(LPCSTR szDir, LPCTSTR szDest, LPCSTR /* szDbName */, HWND progr const auto& file = it->path();
if (!fs::is_directory(file) && !strstr(file.file_string().c_str(), _T2A(szDest)))
{
- std::string filepath = file.file_string();
- std::string rpath = filepath.substr(filepath.find(szDir) + mir_strlen(szDir) + 1);
+ const std::string &filepath = file.file_string();
+ const std::string rpath = filepath.substr(filepath.find(szDir) + mir_strlen(szDir) + 1);
HANDLE hSrc;
diff --git a/plugins/Db_autobackups/src/stdafx.h b/plugins/Db_autobackups/src/stdafx.h index f00a90cb64..77dd225a59 100644 --- a/plugins/Db_autobackups/src/stdafx.h +++ b/plugins/Db_autobackups/src/stdafx.h @@ -6,11 +6,13 @@ #include <windows.h>
#include <shlobj.h>
#include <time.h>
-#include <filesystem>
#include <vector>
+
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
+# include <filesystem>
namespace fs = std::tr2::sys;
#else
+# include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
#endif
|