diff --git a/icd/vendor.hpp b/icd/vendor.hpp index d40bdef..668f1ef 100644 --- a/icd/vendor.hpp +++ b/icd/vendor.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include /////////////////////////////////////////////////////////////////////////////// @@ -13,7 +13,7 @@ namespace cruft::vk::icd { struct icd_t { std::string file_format_version; struct { - std::experimental::filesystem::path library_path; + std::filesystem::path library_path; std::string api_version; } icd; }; diff --git a/icd/vendor_posix.cpp b/icd/vendor_posix.cpp index b75b9ab..3f3b945 100644 --- a/icd/vendor_posix.cpp +++ b/icd/vendor_posix.cpp @@ -8,7 +8,7 @@ #include -namespace fs = std::experimental::filesystem; +namespace fs = std::filesystem; /////////////////////////////////////////////////////////////////////////////// diff --git a/shader_module.cpp b/shader_module.cpp index 0fd5ab9..d062524 100644 --- a/shader_module.cpp +++ b/shader_module.cpp @@ -19,7 +19,7 @@ using cruft::vk::shader_module; /////////////////////////////////////////////////////////////////////////////// struct cruft::vk::shader_module::cookie : public create_t { public: - cookie (const std::experimental::filesystem::path &src): + cookie (std::filesystem::path const &src): create_t {}, m_bytes (cruft::slurp (src)) { @@ -36,8 +36,10 @@ private: /////////////////////////////////////////////////////////////////////////////// -shader_module::shader_module (device &owner, - const std::experimental::filesystem::path &src): +shader_module::shader_module ( + device &owner, + std::filesystem::path const &src +): shader_module (owner, cookie (src)) { ; } diff --git a/shader_module.hpp b/shader_module.hpp index 633a10c..db96c39 100644 --- a/shader_module.hpp +++ b/shader_module.hpp @@ -13,14 +13,14 @@ #include "./object.hpp" #include "./fwd.hpp" -#include +#include namespace cruft::vk { struct shader_module : public owned { using create_t = create_info_t; - shader_module (device&, const std::experimental::filesystem::path &src); + shader_module (device&, const std::filesystem::path &src); private: // used as a convenience to allow taking address of a temporary diff --git a/tools/hello.cpp b/tools/hello.cpp index 0725a9a..76fbdd5 100644 --- a/tools/hello.cpp +++ b/tools/hello.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include ///////////////////////////////////////////////////////////////////////////////