diff options
author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2018-06-07 12:05:48 +0300 |
---|---|---|
committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2018-06-07 12:05:48 +0300 |
commit | 0eb47d30299b63748a2796a9439e53765a5ff101 (patch) | |
tree | e5e4cbd04031afc01a572b9d36e38e4098b9c506 /test | |
parent | 9d2321f2d4ea7076159d984fcf734a415cc9bdd1 (diff) |
AFIO core library now compiles clean using experimental status_code, unit tests remain to be fixed.
Diffstat (limited to 'test')
-rw-r--r-- | test/tests/current_path.cpp | 10 | ||||
-rw-r--r-- | test/tests/directory_handle_create_close/runner.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/tests/current_path.cpp b/test/tests/current_path.cpp index 3f2ae559..23346a8c 100644 --- a/test/tests/current_path.cpp +++ b/test/tests/current_path.cpp @@ -50,7 +50,7 @@ template <class FileHandleType, class DirectoryHandleType> static inline void Te BOOST_CHECK(h1path); if(!h1path) { - std::cerr << "Getting the current path of a file FAILED due to " << h1path.error().message() << std::endl; + std::cerr << "Getting the current path of a file FAILED due to " << h1path.error().message().c_str() << std::endl; } else if(h1path.value().empty()) { @@ -66,7 +66,7 @@ template <class FileHandleType, class DirectoryHandleType> static inline void Te BOOST_CHECK(h2path); if(!h2path) { - std::cerr << "Getting the current path of a directory FAILED due to " << h2path.error().message() << std::endl; + std::cerr << "Getting the current path of a directory FAILED due to " << h2path.error().message().c_str() << std::endl; } else if(h2path.value().empty()) { @@ -87,7 +87,7 @@ template <class FileHandleType, class DirectoryHandleType> static inline void Te BOOST_CHECK(h1path); if(!h1path) { - std::cerr << "Getting the current path of a file FAILED due to " << h1path.error().message() << std::endl; + std::cerr << "Getting the current path of a file FAILED due to " << h1path.error().message().c_str() << std::endl; } else if(h1path.value().empty()) { @@ -108,7 +108,7 @@ template <class FileHandleType, class DirectoryHandleType> static inline void Te BOOST_CHECK(h2path); if(!h2path) { - std::cerr << "Getting the current path of a directory FAILED due to " << h2path.error().message() << std::endl; + std::cerr << "Getting the current path of a directory FAILED due to " << h2path.error().message().c_str() << std::endl; } else if(h2path.value().empty()) { @@ -133,7 +133,7 @@ template <class FileHandleType, class DirectoryHandleType> static inline void Te BOOST_CHECK(h1path); if(!h1path) { - std::cerr << "Getting the current path of a file FAILED due to " << h1path.error().message() << std::endl; + std::cerr << "Getting the current path of a file FAILED due to " << h1path.error().message().c_str() << std::endl; } else if(h1path.value().empty()) { diff --git a/test/tests/directory_handle_create_close/runner.cpp b/test/tests/directory_handle_create_close/runner.cpp index c052089a..90b1fa1d 100644 --- a/test/tests/directory_handle_create_close/runner.cpp +++ b/test/tests/directory_handle_create_close/runner.cpp @@ -37,7 +37,7 @@ template <class U> inline void directory_handle_create_close_creation(U &&f) // clang-format off static typename directory_handle::buffer_type _entries[5]; static typename directory_handle::buffers_type entries(_entries); - static result<typename directory_handle::enumerate_info> info(AFIO_V2_NAMESPACE::error_info{}); + static result<typename directory_handle::enumerate_info> info(typename result<typename directory_handle::enumerate_info>::error_type{}); static const auto permuter(mt_permute_parameters< result<void>, parameters< @@ -87,7 +87,7 @@ template <class U> inline void directory_handle_create_close_creation(U &&f) i = typename directory_handle::buffer_type(); } entries = typename directory_handle::buffers_type(_entries); - info = AFIO_V2_NAMESPACE::error_info(); + info = typename result<typename directory_handle::enumerate_info>::error_type(); return std::make_tuple(std::ref(permuter), std::ref(testreturn), idx, std::ref(enumeration_should_be)); }, [&](auto /*tuplestate*/) { |