docs/headers.md

@@ -676,6 +676,10 @@ template <class Container>
 constexpr span<typename Container::value_type> make_span(Container& cont);
 template <class Container>
 constexpr span<const typename Container::value_type> make_span(const Container& cont);
+template <class Ptr>
+constexpr span<typename Ptr::element_type> make_span(Ptr& cont, std::size_t count);
+template <class Ptr>
+constexpr span<typename Ptr::element_type> make_span(Ptr& cont);
 ```
 
 Utility function for creating a `span` with [`gsl::dynamic_extent`](#user-content-H-span_ext-dynamic_extent) from

include/gsl/algorithm

@@ -17,8 +17,8 @@
 #ifndef GSL_ALGORITHM_H
 #define GSL_ALGORITHM_H
 
-#include "gsl/assert" // for Expects
+#include "assert" // for Expects
-#include "gsl/span"   // for dynamic_extent, span
+#include "span"   // for dynamic_extent, span
 
 #include <algorithm>   // for copy_n
 #include <cstddef>     // for ptrdiff_t

include/gsl/gsl

@@ -18,16 +18,16 @@
 #define GSL_GSL_H
 
 // IWYU pragma: begin_exports
-#include "gsl/algorithm"   // copy
+#include "algorithm"   // copy
-#include "gsl/assert"      // Ensures/Expects
+#include "assert"      // Ensures/Expects
-#include "gsl/byte"        // byte
+#include "byte"        // byte
-#include "gsl/pointers"    // owner, not_null
+#include "pointers"    // owner, not_null
-#include "gsl/span"        // span
+#include "span"        // span
-#include "gsl/zstring"     // zstring
+#include "zstring"     // zstring
-#include "gsl/util"        // finally()/narrow_cast()...
+#include "util"        // finally()/narrow_cast()...
 
 #ifdef __cpp_exceptions
-#include "gsl/narrow" // narrow()
+#include "narrow" // narrow()
 #endif
 // IWYU pragma: end_exports
 

include/gsl/narrow

@@ -16,8 +16,8 @@
 
 #ifndef GSL_NARROW_H
 #define GSL_NARROW_H
-#include "gsl/assert"    // for GSL_SUPPRESS
+#include "assert"    // for GSL_SUPPRESS
-#include "gsl/util"      // for narrow_cast
+#include "util"      // for narrow_cast
 #include <exception> // for std::exception
 namespace gsl
 {

include/gsl/pointers

@@ -17,7 +17,7 @@
 #ifndef GSL_POINTERS_H
 #define GSL_POINTERS_H
 
-#include "gsl/assert" // for Ensures, Expects
+#include "assert" // for Ensures, Expects
 
 #include <cstddef>      // for ptrdiff_t, nullptr_t, size_t
 #include <functional>   // for less, greater

include/gsl/span

@@ -17,10 +17,10 @@
 #ifndef GSL_SPAN_H
 #define GSL_SPAN_H
 
-#include "gsl/assert"   // for Expects
+#include "assert"   // for Expects
-#include "gsl/byte"     // for byte
+#include "byte"     // for byte
-#include "gsl/span_ext" // for span specialization of gsl::at and other span-related extensions
+#include "span_ext" // for span specialization of gsl::at and other span-related extensions
-#include "gsl/util"     // for narrow_cast
+#include "util"     // for narrow_cast
 
 #include <array>       // for array
 #include <cstddef>     // for ptrdiff_t, size_t, nullptr_t

include/gsl/span_ext

@@ -27,8 +27,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "gsl/assert" // GSL_KERNEL_MODE
+#include "assert" // GSL_KERNEL_MODE
-#include "gsl/util"   // for narrow_cast, narrow
+#include "util"   // for narrow_cast, narrow
 
 #include <cstddef> // for ptrdiff_t, size_t
 #include <utility>

include/gsl/string_span

@@ -0,0 +1,4 @@
+#pragma once
+#pragma message(                                                                                   \
+    "This header will soon be removed. Use <gsl/zstring> instead of <gsl/string_span>")
+#include "zstring"

include/gsl/util

@@ -17,7 +17,7 @@
 #ifndef GSL_UTIL_H
 #define GSL_UTIL_H
 
-#include "gsl/assert" // for Expects
+#include "assert" // for Expects
 
 #include <array>
 #include <cstddef>          // for ptrdiff_t, size_t

include/gsl/zstring

@@ -17,7 +17,7 @@
 #ifndef GSL_ZSTRING_H
 #define GSL_ZSTRING_H
 
-#include "gsl/span_ext" // for dynamic_extent
+#include "span_ext" // for dynamic_extent
 
 #include <cstddef>   // for size_t, nullptr_t