From 7f2645a4d979cfd3c36b52081d4424bc8cce5c82 Mon Sep 17 00:00:00 2001
From: MikeGitb <MikeGitb@users.noreply.github.com>
Date: Thu, 8 Dec 2016 15:52:47 +0100
Subject: [PATCH] small fixes to as_bytes() for pod types

- consistent enable_if clause between as_bytes and as_writable_bytes
- Explicitly check for non-const as_writeable_bytes
- move overloads to right section of the file
---
 gsl/span | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/gsl/span b/gsl/span
index 0651329..a46d3bf 100644
--- a/gsl/span
+++ b/gsl/span
@@ -308,7 +308,7 @@ namespace details
         constexpr extent_type() noexcept {}
 
         template <index_type Other>
-        constexpr extent_type(extent_type<Other> ext) 
+        constexpr extent_type(extent_type<Other> ext)
         {
             static_assert(Other == Ext || Other == dynamic_extent,
                           "Mismatch between fixed-size extent and size of initializing data.");
@@ -632,6 +632,22 @@ as_writeable_bytes(span<ElementType, Extent> s) noexcept
     return {reinterpret_cast<byte*>(s.data()), s.size_bytes()};
 }
 
+
+template <class T, class = std::enable_if_t<std::is_pod<T>::value>>
+span<const byte, sizeof(T)>
+as_bytes(const T& e) noexcept
+{
+    return {reinterpret_cast<const byte*>(&e), sizeof(e)};
+}
+
+template <class T, class = std::enable_if_t<std::is_pod<T>::value>>
+span<byte, sizeof(T)>
+as_writeable_bytes(T& e) noexcept
+{
+    static_assert(!std::is_const<T>::value,"Can't create a span of writeable bytes over a const object");
+    return {reinterpret_cast<byte*>(&e), sizeof(e)};
+}
+
 //
 // make_span() - Utility functions for creating spans
 //
@@ -670,19 +686,6 @@ span<typename Ptr::element_type>
 make_span(Ptr& cont)
 { return span<typename Ptr::element_type>(cont); }
 
-template <class T, class = std::enable_if_t<std::is_pod<T>::value>>
-span<const byte, sizeof(T)>
-as_bytes(const T& e) noexcept
-{
-    return{ reinterpret_cast<const byte*>(&e),sizeof(T) };
-}
-
-template <class T, class = std::enable_if_t<std::is_trivially_copyable<T>::value>>
-span<byte, sizeof(T)>
-as_writeable_bytes(T& e) noexcept
-{
-    return{ reinterpret_cast<byte*>(&e),sizeof(T) };
-}
 
 // Specialization of gsl::at for span
 template <class ElementType, std::ptrdiff_t Extent>