Skip to content

Commit 4a9e53b

Browse files
authored
Merge pull request #548 from jandres742/url0_loader
Fix filesystem
2 parents a6083f5 + c4570a2 commit 4a9e53b

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

source/common/logger/ur_sinks.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class FileSink : public Sink {
169169

170170
inline std::unique_ptr<Sink> sink_from_str(std::string logger_name,
171171
std::string name,
172-
std::filesystem::path file_path = "",
172+
filesystem::path file_path = "",
173173
bool skip_prefix = false) {
174174
if (name == "stdout" && file_path.empty()) {
175175
return std::make_unique<logger::StdoutSink>(logger_name, skip_prefix);

source/loader/linux/loader_location.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "ur_filesystem_resolved.hpp"
1313
#include "ur_loader.hpp"
1414

15-
namespace fs = std::filesystem;
15+
namespace fs = filesystem;
1616

1717
namespace ur_loader {
1818

source/loader/ur_adapter_registry.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "ur_loader_location.hpp"
1515
#include "ur_util.hpp"
1616

17-
namespace fs = std::filesystem;
17+
namespace fs = filesystem;
1818

1919
namespace ur_loader {
2020

source/loader/ur_loader_location.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "ur_filesystem_resolved.hpp"
1313

14-
namespace fs = std::filesystem;
14+
namespace fs = filesystem;
1515

1616
namespace ur_loader {
1717

source/loader/windows/loader_location.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#define MAX_PATH_LEN_WIN 32767
1818

19-
namespace fs = std::filesystem;
19+
namespace fs = filesystem;
2020

2121
namespace ur_loader {
2222

test/unit/logger/fixtures.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class LoggerCommonSetup : public ::testing::Test {
2323

2424
class LoggerWithFileSink : public LoggerCommonSetup {
2525
protected:
26-
const std::filesystem::path file_name = "ur_test_logger.log";
27-
std::filesystem::path file_path = file_name;
26+
const filesystem::path file_name = "ur_test_logger.log";
27+
filesystem::path file_path = file_name;
2828
std::stringstream test_msg;
2929

3030
void TearDown() override {
@@ -34,7 +34,7 @@ class LoggerWithFileSink : public LoggerCommonSetup {
3434
printed_msg << test_log.rdbuf();
3535
test_log.close();
3636

37-
ASSERT_GT(std::filesystem::remove_all(*file_path.begin()), 0);
37+
ASSERT_GT(filesystem::remove_all(*file_path.begin()), 0);
3838
ASSERT_EQ(printed_msg.str(), test_msg.str());
3939
}
4040
};

test/unit/logger/logger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ TEST_F(UniquePtrLoggerWithFilesink, NestedFilePath) {
111111
for (int i = 0; i < 20; ++i) {
112112
file_path /= dir_name;
113113
}
114-
std::filesystem::create_directories(file_path);
114+
filesystem::create_directories(file_path);
115115
file_path /= file_name;
116116
logger = std::make_unique<logger::Logger>(
117117
logger::Level::WARN, std::make_unique<logger::FileSink>(

0 commit comments

Comments
 (0)