From 034d1a32c8a9b0541eade6859e977abea1376d54 Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 17 Aug 2023 22:18:06 +0200 Subject: [PATCH 1/2] remove fallback solution --- kratos/includes/kratos_filesystem.h | 11 ----------- kratos/sources/kratos_filesystem.cpp | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/kratos/includes/kratos_filesystem.h b/kratos/includes/kratos_filesystem.h index 4ee5f37c7661..dd0bdc7d9562 100644 --- a/kratos/includes/kratos_filesystem.h +++ b/kratos/includes/kratos_filesystem.h @@ -15,17 +15,6 @@ // System includes #include #include -#if __has_include() // Check if the header "" exists - #include // We have a decent compiler and can use the normal version -#elif __has_include() // Check if the header "" exists - #include - // We need the alias from std::experimental::filesystem to std::filesystem - namespace std { - namespace filesystem = experimental::filesystem; - } -#else // Fail if neither header is available with a nice error message - #error Could not find system header "" or "" -#endif // #if __has_include() // External includes diff --git a/kratos/sources/kratos_filesystem.cpp b/kratos/sources/kratos_filesystem.cpp index 25d073f4c1c6..9978a3e1c8aa 100644 --- a/kratos/sources/kratos_filesystem.cpp +++ b/kratos/sources/kratos_filesystem.cpp @@ -12,9 +12,10 @@ // System includes #include -#include #include +#include #include +#include // External includes From 68cb4c126eba759dc34f654903447e1f39eea8d2 Mon Sep 17 00:00:00 2001 From: Philipp Bucher Date: Fri, 18 Aug 2023 10:22:31 +0200 Subject: [PATCH 2/2] fix include --- kratos/includes/kratos_filesystem.h | 1 + kratos/sources/kratos_filesystem.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/kratos/includes/kratos_filesystem.h b/kratos/includes/kratos_filesystem.h index dd0bdc7d9562..ec97b6e0d013 100644 --- a/kratos/includes/kratos_filesystem.h +++ b/kratos/includes/kratos_filesystem.h @@ -13,6 +13,7 @@ #pragma once // System includes +#include #include #include diff --git a/kratos/sources/kratos_filesystem.cpp b/kratos/sources/kratos_filesystem.cpp index 9978a3e1c8aa..472b5b2d1e2b 100644 --- a/kratos/sources/kratos_filesystem.cpp +++ b/kratos/sources/kratos_filesystem.cpp @@ -13,7 +13,6 @@ // System includes #include #include -#include #include #include