In status_code build, rename error_code to file_io_error to match TS wording

5 files changed, 43 insertions, 43 deletions

diff --git a/doc/html b/doc/html
-Subproject 925dba9720373bb34028cd5cb7667e618fe4d7d
+Subproject 6655470986e33c3bd9d7d362b901346e20db5fe
diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp
index 24b40846..170a3b7e 100644
--- a/include/llfio/revision.hpp
+++ b/include/llfio/revision.hpp
@@ -1,4 +1,4 @@
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define LLFIO_PREVIOUS_COMMIT_REF    c2b2bcc9c595b35e4dc456f79994889cf3d00374
-#define LLFIO_PREVIOUS_COMMIT_DATE   "2018-07-09 08:59:21 +00:00"
-#define LLFIO_PREVIOUS_COMMIT_UNIQUE c2b2bcc9
+#define LLFIO_PREVIOUS_COMMIT_REF    87cfaf9bd54b9dca5adfd9263a86d7af45a297b3
+#define LLFIO_PREVIOUS_COMMIT_DATE   "2018-07-11 18:08:32 +00:00"
+#define LLFIO_PREVIOUS_COMMIT_UNIQUE 87cfaf9b
diff --git a/include/llfio/v2.0/handle.hpp b/include/llfio/v2.0/handle.hpp
index 6df647cb..430848c7 100644
--- a/include/llfio/v2.0/handle.hpp
+++ b/include/llfio/v2.0/handle.hpp
@@ -471,9 +471,9 @@ namespace detail
 #ifndef LLFIO_DISABLE_PATHS_IN_FAILURE_INFO
 
 //! Helper for constructing an error code from an errc
-inline error_code generic_error(errc c)
+inline file_io_error generic_error(errc c)
 {
-  SYSTEM_ERROR2_NAMESPACE::status_code<error_domain<SYSTEM_ERROR2_NAMESPACE::generic_code::domain_type>> sc(c);
+  SYSTEM_ERROR2_NAMESPACE::status_code<file_io_error_domain<SYSTEM_ERROR2_NAMESPACE::generic_code::domain_type>> sc(c);
   if(sc.failure())
   {
     detail::fill_failure_info(sc.value(), sc);
@@ -482,9 +482,9 @@ inline error_code generic_error(errc c)
 }
 #ifndef _WIN32
 //! Helper for constructing an error code from a POSIX errno
-inline error_code posix_error(int c)
+inline file_io_error posix_error(int c)
 {
-  SYSTEM_ERROR2_NAMESPACE::status_code<error_domain<SYSTEM_ERROR2_NAMESPACE::posix_code::domain_type>> sc(c);
+  SYSTEM_ERROR2_NAMESPACE::status_code<file_io_error_domain<SYSTEM_ERROR2_NAMESPACE::posix_code::domain_type>> sc(c);
   if(sc.failure())
   {
     detail::fill_failure_info(sc.value(), sc);
@@ -493,9 +493,9 @@ inline error_code posix_error(int c)
 }
 #else
 //! Helper for constructing an error code from a DWORD
-inline error_code win32_error(SYSTEM_ERROR2_NAMESPACE::win32::DWORD c)
+inline file_io_error win32_error(SYSTEM_ERROR2_NAMESPACE::win32::DWORD c)
 {
-  SYSTEM_ERROR2_NAMESPACE::status_code<error_domain<SYSTEM_ERROR2_NAMESPACE::win32_code::domain_type>> sc(c);
+  SYSTEM_ERROR2_NAMESPACE::status_code<file_io_error_domain<SYSTEM_ERROR2_NAMESPACE::win32_code::domain_type>> sc(c);
   if(sc.failure())
   {
     detail::fill_failure_info(sc.value(), sc);
@@ -503,9 +503,9 @@ inline error_code win32_error(SYSTEM_ERROR2_NAMESPACE::win32::DWORD c)
   return sc;
 }
 //! Helper for constructing an error code from a NTSTATUS
-inline error_code ntkernel_error(SYSTEM_ERROR2_NAMESPACE::win32::NTSTATUS c)
+inline file_io_error ntkernel_error(SYSTEM_ERROR2_NAMESPACE::win32::NTSTATUS c)
 {
-  SYSTEM_ERROR2_NAMESPACE::status_code<error_domain<SYSTEM_ERROR2_NAMESPACE::nt_code::domain_type>> sc(c);
+  SYSTEM_ERROR2_NAMESPACE::status_code<file_io_error_domain<SYSTEM_ERROR2_NAMESPACE::nt_code::domain_type>> sc(c);
   if(sc.failure())
   {
     detail::fill_failure_info(sc.value(), sc);
diff --git a/include/llfio/v2.0/status_code.hpp b/include/llfio/v2.0/status_code.hpp
index eb4803cb..5c240316 100644
--- a/include/llfio/v2.0/status_code.hpp
+++ b/include/llfio/v2.0/status_code.hpp
@@ -44,7 +44,7 @@ status codes for LLFIO with these combinations:
 
 Each of these is a separate LLFIO custom status code domain. We also define
 an erased form of these custom domains, and that is typedefed to
-error_domain<intptr_t>::value_type.
+file_io_error_domain<intptr_t>::value_type.
 
 This design ensure that LLFIO can be configured into either std-based error
 handling or SG14 experimental status code handling. It defaults to the latter
@@ -64,7 +64,7 @@ LLFIO_V2_NAMESPACE_BEGIN
 
 namespace detail
 {
-  template <class T> struct error_domain_value_type
+  template <class T> struct file_io_error_value_type
   {
     //! \brief The type of code
     T sc{};
@@ -77,10 +77,10 @@ namespace detail
     size_t _log_id{static_cast<size_t>(-1)};
 
     //! Default construction
-    error_domain_value_type() = default;
+    file_io_error_value_type() = default;
 
     //! Implicitly constructs an instance
-    constexpr inline error_domain_value_type(T _sc)
+    constexpr inline file_io_error_value_type(T _sc)
         : sc(_sc)
     {
     }  // NOLINT
@@ -90,7 +90,7 @@ namespace detail
   };
 }
 
-template <class BaseStatusCodeDomain> class error_domain;
+template <class BaseStatusCodeDomain> class file_io_error_domain;
 
 LLFIO_V2_NAMESPACE_END
 
@@ -98,7 +98,7 @@ LLFIO_V2_NAMESPACE_END
 SYSTEM_ERROR2_NAMESPACE_BEGIN
 namespace mixins
 {
-  template <class Base, class BaseStatusCodeDomain> struct mixin<Base, ::LLFIO_V2_NAMESPACE::error_domain<BaseStatusCodeDomain>> : public Base
+  template <class Base, class BaseStatusCodeDomain> struct mixin<Base, ::LLFIO_V2_NAMESPACE::file_io_error_domain<BaseStatusCodeDomain>> : public Base
   {
     using Base::Base;
 
@@ -148,12 +148,12 @@ SYSTEM_ERROR2_NAMESPACE_END
 
 LLFIO_V2_NAMESPACE_BEGIN
 
-/*! \class error_domain
+/*! \class file_io_error_domain
 \brief The SG14 status code domain for errors in LLFIO.
 */
-template <class BaseStatusCodeDomain> class error_domain : public BaseStatusCodeDomain
+template <class BaseStatusCodeDomain> class file_io_error_domain : public BaseStatusCodeDomain
 {
-  friend class SYSTEM_ERROR2_NAMESPACE::status_code<error_domain>;
+  friend class SYSTEM_ERROR2_NAMESPACE::status_code<file_io_error_domain>;
   using _base = BaseStatusCodeDomain;
 
 public:
@@ -161,20 +161,20 @@ public:
   using atomic_refcounted_string_ref = typename BaseStatusCodeDomain::atomic_refcounted_string_ref;
 
   //! \brief The value type of errors in LLFIO
-  using value_type = detail::error_domain_value_type<typename _base::value_type>;
+  using value_type = detail::file_io_error_value_type<typename _base::value_type>;
 
-  error_domain() = default;
-  error_domain(const error_domain &) = default;
-  error_domain(error_domain &&) = default;
-  error_domain &operator=(const error_domain &) = default;
-  error_domain &operator=(error_domain &&) = default;
-  ~error_domain() = default;
+  file_io_error_domain() = default;
+  file_io_error_domain(const file_io_error_domain &) = default;
+  file_io_error_domain(file_io_error_domain &&) = default;
+  file_io_error_domain &operator=(const file_io_error_domain &) = default;
+  file_io_error_domain &operator=(file_io_error_domain &&) = default;
+  ~file_io_error_domain() = default;
 
 protected:
   virtual inline string_ref _do_message(const SYSTEM_ERROR2_NAMESPACE::status_code<void> &code) const noexcept override final
   {
     assert(code.domain() == *this);
-    const auto &v = static_cast<const SYSTEM_ERROR2_NAMESPACE::status_code<error_domain> &>(code);  // NOLINT
+    const auto &v = static_cast<const SYSTEM_ERROR2_NAMESPACE::status_code<file_io_error_domain> &>(code);  // NOLINT
     // Get the paths for this failure, if any, using the mixins from above
     auto paths = v._paths();
     // Get the base message for this failure
@@ -225,19 +225,19 @@ protected:
 };
 
 #else   // LLFIO_DISABLE_PATHS_IN_FAILURE_INFO
-template <class BaseStatusCodeDomain> using error_domain = BaseStatusCodeDomain;
+template <class BaseStatusCodeDomain> using file_io_error_domain = BaseStatusCodeDomain;
 #endif  // LLFIO_DISABLE_PATHS_IN_FAILURE_INFO
 
 namespace detail
 {
-  using error_domain_value_system_code = error_domain_value_type<SYSTEM_ERROR2_NAMESPACE::system_code::value_type>;
+  using file_io_error_domain_value_system_code = file_io_error_value_type<SYSTEM_ERROR2_NAMESPACE::system_code::value_type>;
 }
 
 //! An erased status code
-using error_code = SYSTEM_ERROR2_NAMESPACE::errored_status_code<SYSTEM_ERROR2_NAMESPACE::erased<detail::error_domain_value_system_code>>;
+using file_io_error = SYSTEM_ERROR2_NAMESPACE::errored_status_code<SYSTEM_ERROR2_NAMESPACE::erased<detail::file_io_error_domain_value_system_code>>;
 
 
-template <class T> using result = OUTCOME_V2_NAMESPACE::experimental::erased_result<T, error_code>;
+template <class T> using result = OUTCOME_V2_NAMESPACE::experimental::erased_result<T, file_io_error>;
 using OUTCOME_V2_NAMESPACE::success;
 using OUTCOME_V2_NAMESPACE::failure;
 using OUTCOME_V2_NAMESPACE::in_place_type;
@@ -246,22 +246,22 @@ using OUTCOME_V2_NAMESPACE::in_place_type;
 using SYSTEM_ERROR2_NAMESPACE::errc;
 
 //! Helper for constructing an error code from an errc
-inline error_code generic_error(errc c);
+inline file_io_error generic_error(errc c);
 #ifndef _WIN32
 //! Helper for constructing an error code from a POSIX errno
-inline error_code posix_error(int c = errno);
+inline file_io_error posix_error(int c = errno);
 #else
 //! Helper for constructing an error code from a DWORD
-inline error_code win32_error(SYSTEM_ERROR2_NAMESPACE::win32::DWORD c = SYSTEM_ERROR2_NAMESPACE::win32::GetLastError());
+inline file_io_error win32_error(SYSTEM_ERROR2_NAMESPACE::win32::DWORD c = SYSTEM_ERROR2_NAMESPACE::win32::GetLastError());
 //! Helper for constructing an error code from a NTSTATUS
-inline error_code ntkernel_error(SYSTEM_ERROR2_NAMESPACE::win32::NTSTATUS c);
+inline file_io_error ntkernel_error(SYSTEM_ERROR2_NAMESPACE::win32::NTSTATUS c);
 #endif
 
 namespace detail
 {
-  inline std::ostream &operator<<(std::ostream &s, const error_code &v) { return s << "llfio::error_code(" << v.message().c_str() << ")"; }
+  inline std::ostream &operator<<(std::ostream &s, const file_io_error &v) { return s << "llfio::file_io_error(" << v.message().c_str() << ")"; }
 }
-inline error_code error_from_exception(std::exception_ptr &&ep = std::current_exception(), error_code not_matched = generic_error(errc::resource_unavailable_try_again)) noexcept
+inline file_io_error error_from_exception(std::exception_ptr &&ep = std::current_exception(), file_io_error not_matched = generic_error(errc::resource_unavailable_try_again)) noexcept
 {
   if(!ep)
   {
diff --git a/include/llfio/v2.0/storage_profile.hpp b/include/llfio/v2.0/storage_profile.hpp
index fc1b7364..9d1a3679 100644
--- a/include/llfio/v2.0/storage_profile.hpp
+++ b/include/llfio/v2.0/storage_profile.hpp
@@ -30,7 +30,7 @@ Distributed under the Boost Software License, Version 1.0.
 #if LLFIO_EXPERIMENTAL_STATUS_CODE
 #include "outcome/include/outcome/experimental/status_outcome.hpp"
 LLFIO_V2_NAMESPACE_EXPORT_BEGIN
-template <class T> using outcome = OUTCOME_V2_NAMESPACE::experimental::erased_outcome<T, error_code>;
+template <class T> using outcome = OUTCOME_V2_NAMESPACE::experimental::erased_outcome<T, file_io_error>;
 LLFIO_V2_NAMESPACE_END
 #endif