diff options
| -rw-r--r-- | include/filesystem.hpp | 14 | ||||
| -rw-r--r-- | include/openbmc_dbus_rest.hpp | 3 | ||||
| -rw-r--r-- | include/webassets.hpp | 3 | ||||
| -rw-r--r-- | redfish-core/lib/log_services.hpp | 2 |
4 files changed, 3 insertions, 19 deletions
diff --git a/include/filesystem.hpp b/include/filesystem.hpp deleted file mode 100644 index 9915ee1e17..0000000000 --- a/include/filesystem.hpp +++ /dev/null @@ -1,14 +0,0 @@ -// this file splices filesystem in depending on the implementation - -#if __has_include(<filesystem>) -#include <filesystem> -#elif __has_include(<experimental/filesystem>) -#include <experimental/filesystem> -namespace std -{ -// splice experimental::filesystem into std -namespace filesystem = std::experimental::filesystem; -} // namespace std -#else -#error filesystem not available -#endif diff --git a/include/openbmc_dbus_rest.hpp b/include/openbmc_dbus_rest.hpp index 605d6f9d72..6938079f23 100644 --- a/include/openbmc_dbus_rest.hpp +++ b/include/openbmc_dbus_rest.hpp @@ -13,8 +13,6 @@ // limitations under the License. #pragma once -#include "filesystem.hpp" - #include <crow/app.h> #include <tinyxml2.h> @@ -23,6 +21,7 @@ #include <boost/container/flat_set.hpp> #include <dbus_singleton.hpp> #include <dbus_utility.hpp> +#include <filesystem> #include <fstream> #include <sdbusplus/message/types.hpp> diff --git a/include/webassets.hpp b/include/webassets.hpp index 9bd40dbf8f..daead984fc 100644 --- a/include/webassets.hpp +++ b/include/webassets.hpp @@ -1,7 +1,5 @@ #pragma once -#include "filesystem.hpp" - #include <crow/app.h> #include <crow/http_request.h> #include <crow/http_response.h> @@ -9,6 +7,7 @@ #include <boost/algorithm/string/replace.hpp> #include <boost/container/flat_set.hpp> +#include <filesystem> #include <fstream> #include <string> diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp index 6aea6242ac..e30c8b0437 100644 --- a/redfish-core/lib/log_services.hpp +++ b/redfish-core/lib/log_services.hpp @@ -15,13 +15,13 @@ */ #pragma once -#include "filesystem.hpp" #include "node.hpp" #include <systemd/sd-journal.h> #include <boost/container/flat_map.hpp> #include <error_messages.hpp> +#include <filesystem> #include <variant> namespace redfish |