Skip to content

Commit d5b446c

Browse files
committed
chore: apply 295 patch to re-run with new main
1 parent bd1bae2 commit d5b446c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

include/toml11/compat.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,13 +448,13 @@ using void_t = void;
448448
// ----------------------------------------------------------------------------
449449
// (subset of) source_location
450450

451-
#if TOML11_CPLUSPLUS_STANDARD_VERSION >= 202002L
451+
#if ! defined(TOML11_DISABLE_SOURCE_LOCATION) && TOML11_CPLUSPLUS_STANDARD_VERSION >= 202002L
452452
# if __has_include(<source_location>)
453453
# define TOML11_HAS_STD_SOURCE_LOCATION
454454
# endif // has_include
455455
#endif // c++20
456456

457-
#if ! defined(TOML11_HAS_STD_SOURCE_LOCATION)
457+
#if ! defined(TOML11_DISABLE_SOURCE_LOCATION) && ! defined(TOML11_HAS_STD_SOURCE_LOCATION)
458458
# if defined(__GNUC__) && ! defined(__clang__)
459459
# if TOML11_CPLUSPLUS_STANDARD_VERSION >= TOML11_CXX14_VALUE
460460
# if __has_include(<experimental/source_location>)
@@ -464,7 +464,7 @@ using void_t = void;
464464
# endif // GNU g++
465465
#endif // not TOML11_HAS_STD_SOURCE_LOCATION
466466

467-
#if ! defined(TOML11_HAS_STD_SOURCE_LOCATION) && ! defined(TOML11_HAS_EXPERIMENTAL_SOURCE_LOCATION)
467+
#if ! defined(TOML11_DISABLE_SOURCE_LOCATION) && ! defined(TOML11_HAS_STD_SOURCE_LOCATION) && ! defined(TOML11_HAS_EXPERIMENTAL_SOURCE_LOCATION)
468468
# if defined(__GNUC__) && ! defined(__clang__)
469469
# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9))
470470
# define TOML11_HAS_BUILTIN_FILE_LINE 1

0 commit comments

Comments
 (0)