PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

use std::filesystem for windows

pull/2096/head
orignal 3 months ago
parent
b3aa5ad998
commit
e957d7bbfb
2 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      libi2pd/FS.cpp
  2. 2
      libi2pd/FS.h

8
libi2pd/FS.cpp
Unescape View File

@ -61,7 +61,7 @@ namespace fs {
const std::string GetUTF8DataDir () { const std::string GetUTF8DataDir () {
#ifdef _WIN32 #ifdef _WIN32
#if (BOOST_VERSION >= 108500) #if ((BOOST_VERSION >= 108500) || STD_FILESYSTEM)
fs_lib::path path (dataDir); fs_lib::path path (dataDir);
#else #else
fs_lib::wpath path (dataDir); fs_lib::wpath path (dataDir);
@ -98,7 +98,7 @@ namespace fs {
} }
else else
{ {
#if (BOOST_VERSION >= 108500) #if ((BOOST_VERSION >= 108500) || STD_FILESYSTEM)
dataDir = fs_lib::path(commonAppData).string() + "\\" + appName; dataDir = fs_lib::path(commonAppData).string() + "\\" + appName;
#else #else
dataDir = fs_lib::wpath(commonAppData).string() + "\\" + appName; dataDir = fs_lib::wpath(commonAppData).string() + "\\" + appName;
@ -127,7 +127,7 @@ namespace fs {
} }
else else
{ {
#if (BOOST_VERSION >= 108500) #if ((BOOST_VERSION >= 108500) || STD_FILESYSTEM)
auto execPath = fs_lib::path(localAppData).parent_path(); auto execPath = fs_lib::path(localAppData).parent_path();
#else #else
auto execPath = fs_lib::wpath(localAppData).parent_path(); auto execPath = fs_lib::wpath(localAppData).parent_path();
@ -150,7 +150,7 @@ namespace fs {
} }
else else
{ {
#if (BOOST_VERSION >= 108500) #if ((BOOST_VERSION >= 108500) || STD_FILESYSTEM)
dataDir = fs_lib::path(localAppData).string() + "\\" + appName; dataDir = fs_lib::path(localAppData).string() + "\\" + appName;
#else #else
dataDir = fs_lib::wpath(localAppData).string() + "\\" + appName; dataDir = fs_lib::wpath(localAppData).string() + "\\" + appName;

2
libi2pd/FS.h
Unescape View File

@ -15,7 +15,7 @@
#include <sstream> #include <sstream>
#include <functional> #include <functional>
#if (!defined(_WIN32) && !defined(MAC_OSX) && !TARGET_OS_SIMULATOR && \ #if (!defined(MAC_OSX) && !TARGET_OS_SIMULATOR && \
(__cplusplus >= 201703L) && defined(__cpp_lib_filesystem)) // C++ 17 or higher supporting filesystem (__cplusplus >= 201703L) && defined(__cpp_lib_filesystem)) // C++ 17 or higher supporting filesystem
# define STD_FILESYSTEM 1 # define STD_FILESYSTEM 1
#endif #endif

Write Preview
Loading…
Cancel
Save