Skip to content

Guard includes of standard library headers so users can use import std #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidhunter22 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Guard includes of standard library headers so users can use import std #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions include/gsl/algorithm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@
#include "./assert" // for Expects
#include "./span" // for dynamic_extent, span

#include <algorithm> // for copy_n
#include <cstddef> // for ptrdiff_t
#include <type_traits> // for is_assignable
#if defined(GSL_BUILD_USING_STD_MODULE)
import std;
#else
#include <algorithm> // for copy_n
#include <cstddef> // for ptrdiff_t
#include <type_traits> // for is_assignable
#endif

#ifdef _MSC_VER
#pragma warning(push)
Expand Down
6 changes: 5 additions & 1 deletion include/gsl/assert
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@
#else // defined(_MSC_VER) && (defined(_KERNEL_MODE) || (defined(_HAS_EXCEPTIONS) &&
// !_HAS_EXCEPTIONS))

#include <exception>
#if defined(GSL_BUILD_USING_STD_MODULE)
import std;
#else
#include <exception>
#endif

#endif // defined(_MSC_VER) && (defined(_KERNEL_MODE) || (defined(_HAS_EXCEPTIONS) &&
// !_HAS_EXCEPTIONS))
Expand Down
14 changes: 11 additions & 3 deletions include/gsl/byte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

#include "./util" // for GSL_DEPRECATED

#include <type_traits>
#if defined(GSL_BUILD_USING_STD_MODULE)
import std;
#else
#include <type_traits>
#endif

#ifdef _MSC_VER

Expand All @@ -45,7 +49,9 @@
#else // _MSC_VER

#ifndef GSL_USE_STD_BYTE
#include <cstddef> /* __cpp_lib_byte */
#if !defined(GSL_BUILD_USING_STD_MODULE)
#include <cstddef> /* __cpp_lib_byte */
#endif
// this tests if we are under GCC or Clang with enough -std=c++1z power to get us std::byte
// also check if libc++ version is sufficient (> 5.0) or libstdc++ actually contains std::byte
#if defined(__cplusplus) && (__cplusplus >= 201703L) && \
Expand Down Expand Up @@ -75,7 +81,9 @@
#endif // defined __clang__ || defined __GNUC__

#if GSL_USE_STD_BYTE
#include <cstddef>
#if !defined(GSL_BUILD_USING_STD_MODULE)
#include <cstddef>
#endif
#endif

namespace gsl
Expand Down
8 changes: 7 additions & 1 deletion include/gsl/narrow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@
#define GSL_NARROW_H
#include "./assert" // for GSL_SUPPRESS
#include "./util" // for narrow_cast
#include <exception> // for std::exception

#if defined(GSL_BUILD_USING_STD_MODULE)
import std;
#else
#include <exception> // for std::exception
#endif

namespace gsl
{
struct narrowing_error : public std::exception
Expand Down
22 changes: 13 additions & 9 deletions include/gsl/pointers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,19 @@
#include "./assert" // for Ensures, Expects
#include "./util" // for GSL_DEPRECATED

#include <cstddef> // for ptrdiff_t, nullptr_t, size_t
#include <functional> // for less, greater
#include <memory> // for shared_ptr, unique_ptr, hash
#include <type_traits> // for enable_if_t, is_convertible, is_assignable
#include <utility> // for declval, forward

#if !defined(GSL_NO_IOSTREAMS)
#include <iosfwd> // for ostream
#endif // !defined(GSL_NO_IOSTREAMS)
#if defined(GSL_BUILD_USING_STD_MODULE)
import std;
#else
#include <cstddef> // for ptrdiff_t, nullptr_t, size_t
#include <functional> // for less, greater
#include <memory> // for shared_ptr, unique_ptr, hash
#include <type_traits> // for enable_if_t, is_convertible, is_assignable
#include <utility> // for declval, forward

#if !defined(GSL_NO_IOSTREAMS)
#include <iosfwd> // for ostream
#endif // !defined(GSL_NO_IOSTREAMS)
#endif

namespace gsl
{
Expand Down
14 changes: 9 additions & 5 deletions include/gsl/span
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@
#include "./span_ext" // for span specialization of gsl::at and other span-related extensions
#include "./util" // for narrow_cast

#include <array> // for array
#include <cstddef> // for ptrdiff_t, size_t, nullptr_t
#include <iterator> // for reverse_iterator, distance, random_access_...
#include <memory> // for pointer_traits
#include <type_traits> // for enable_if_t, declval, is_convertible, inte...
#if defined(GSL_BUILD_USING_STD_MODULE)
import std;
#else
#include <array> // for array
#include <cstddef> // for ptrdiff_t, size_t, nullptr_t
#include <iterator> // for reverse_iterator, distance, random_access_...
#include <memory> // for pointer_traits
#include <type_traits> // for enable_if_t, declval, is_convertible, inte...
#endif

#if defined(__has_include) && __has_include(<version>)
#include <version>
Expand Down
16 changes: 10 additions & 6 deletions include/gsl/span_ext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,16 @@
#include "./assert" // GSL_KERNEL_MODE
#include "./util" // for narrow_cast, narrow

#include <cstddef> // for ptrdiff_t, size_t
#include <utility>

#ifndef GSL_KERNEL_MODE
#include <algorithm> // for lexicographical_compare
#endif // GSL_KERNEL_MODE
#if defined(GSL_BUILD_USING_STD_MODULE)
import std;
#else
#include <cstddef> // for ptrdiff_t, size_t
#include <utility>

#ifndef GSL_KERNEL_MODE
#include <algorithm> // for lexicographical_compare
#endif // GSL_KERNEL_MODE
#endif

namespace gsl
{
Expand Down
22 changes: 14 additions & 8 deletions include/gsl/util
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,23 @@

#include "./assert" // for Expects

#include <array>
#include <cstddef> // for ptrdiff_t, size_t
#include <limits> // for numeric_limits
#include <initializer_list> // for initializer_list
#include <type_traits> // for is_signed, integral_constant
#include <utility> // for exchange, forward
#if defined(GSL_BUILD_USING_STD_MODULE)
import std;
#else
#include <array>
#include <cstddef> // for ptrdiff_t, size_t
#include <limits> // for numeric_limits
#include <initializer_list> // for initializer_list
#include <type_traits> // for is_signed, integral_constant
#include <utility> // for exchange, forward
#endif

#if defined(__has_include) && __has_include(<version>)
#include <version>
#include <version>
#if defined(__cpp_lib_span) && __cpp_lib_span >= 202002L
#include <span>
#if !defined(GSL_BUILD_USING_STD_MODULE)
#include <span>
#endif
#endif // __cpp_lib_span >= 202002L
#endif //__has_include(<version>)

Expand Down
6 changes: 5 additions & 1 deletion include/gsl/zstring
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@

#include "./span_ext" // for dynamic_extent

#include <cstddef> // for size_t, nullptr_t
#if defined(GSL_BUILD_USING_STD_MODULE)
import std;
#else
#include <cstddef> // for size_t, nullptr_t
#endif

namespace gsl
{
Expand Down