Browse Source

use std::filesystem for windows

pull/2096/head
orignal 4 months ago
parent
commit
e957d7bbfb
  1. 8
      libi2pd/FS.cpp
  2. 2
      libi2pd/FS.h

8
libi2pd/FS.cpp

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

2
libi2pd/FS.h

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
#include <sstream>
#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
# define STD_FILESYSTEM 1
#endif

Loading…
Cancel
Save