Simplified the implementation and features of span

1 files changed, 7 insertions, 20 deletions

diff --git a/contrib/epee/include/hex.h b/contrib/epee/include/hex.h
index 99a86503a..f8d6be048 100644
--- a/contrib/epee/include/hex.h
+++ b/contrib/epee/include/hex.h
@@ -33,46 +33,33 @@
 #include <iosfwd>
 #include <string>
 
-#include "span_view.h"
+#include "span.h"
 
 namespace epee
 {
   struct to_hex
   {
     //! \return A std::string containing hex of `src`.
-    static std::string string(const view<std::uint8_t> src);
-
-    //! \return A std::string containing hex of `src`.
-    static std::string string(const view<char> src) {
-      return string(view_cast<std::uint8_t>(src));
-    }
+    static std::string string(const span<const std::uint8_t> src);
 
     //! \return An array containing hex of `src`.
     template<std::size_t N>
-    static std::array<char, N * 2>
-    array(const std::array<std::uint8_t, N>& src) noexcept(noexcept(view<std::uint8_t>(src)))
+    static std::array<char, N * 2> array(const std::array<std::uint8_t, N>& src) noexcept
     {
       std::array<char, N * 2> out{{}};
       static_assert(N <= 128, "keep the stack size down");
-      buffer_unchecked(out.data(), src);
+      buffer_unchecked(out.data(), {src.data(), src.size()});
       return out;
     }
 
     //! Append `src` as hex to `out`.
-    static void buffer(std::ostream& out, const view<std::uint8_t> src);
+    static void buffer(std::ostream& out, const span<const std::uint8_t> src);
 
     //! Append `< + src + >` as hex to `out`.
-    static void formatted(std::ostream& out, const view<std::uint8_t> src);
-
-    //! Append `< + src + >` as hex to `out`.
-    template<typename T>
-    static void formatted_from_pod(std::ostream& out, const T& pod)
-    {
-      formatted(out, pod_cast<const std::uint8_t>(pod));
-    }
+    static void formatted(std::ostream& out, const span<const std::uint8_t> src);
 
   private:
     //! Write `src` bytes as hex to `out`. `out` must be twice the length
-    static void buffer_unchecked(char* out, const view<std::uint8_t> src) noexcept;
+    static void buffer_unchecked(char* out, const span<const std::uint8_t> src) noexcept;
   };
 }