mirror of
https://github.com/fmtlib/fmt.git
synced 2025-07-30 02:37:36 +02:00
Added workaround for old xcode compiler bug (#3716)
* Added macros to disable std::filesystem and std::variant as a workaround for old xcode bugs * Change macro to positive logic
This commit is contained in:
@ -59,7 +59,24 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cpp_lib_filesystem
|
// For older Xcode versions, __cpp_lib_xxx flags are inaccurately defined.
|
||||||
|
#ifndef FMT_CPP_LIB_FILESYSTEM
|
||||||
|
# ifdef __cpp_lib_filesystem
|
||||||
|
# define FMT_CPP_LIB_FILESYSTEM __cpp_lib_filesystem
|
||||||
|
# else
|
||||||
|
# define FMT_CPP_LIB_FILESYSTEM 0
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef FMT_CPP_LIB_VARIANT
|
||||||
|
# ifdef __cpp_lib_variant
|
||||||
|
# define FMT_CPP_LIB_VARIANT __cpp_lib_variant
|
||||||
|
# else
|
||||||
|
# define FMT_CPP_LIB_VARIANT 0
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if FMT_CPP_LIB_FILESYSTEM
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
namespace detail {
|
namespace detail {
|
||||||
@ -133,7 +150,7 @@ template <typename Char> struct formatter<std::filesystem::path, Char> {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
#endif
|
#endif // FMT_CPP_LIB_FILESYSTEM
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
FMT_EXPORT
|
FMT_EXPORT
|
||||||
@ -211,7 +228,7 @@ struct formatter<std::optional<T>, Char,
|
|||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
#endif // __cpp_lib_optional
|
#endif // __cpp_lib_optional
|
||||||
|
|
||||||
#ifdef __cpp_lib_variant
|
#if FMT_CPP_LIB_VARIANT
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
namespace detail {
|
namespace detail {
|
||||||
|
|
||||||
@ -302,7 +319,7 @@ struct formatter<
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
FMT_END_NAMESPACE
|
FMT_END_NAMESPACE
|
||||||
#endif // __cpp_lib_variant
|
#endif // FMT_CPP_LIB_VARIANT
|
||||||
|
|
||||||
FMT_BEGIN_NAMESPACE
|
FMT_BEGIN_NAMESPACE
|
||||||
FMT_EXPORT
|
FMT_EXPORT
|
||||||
|
Reference in New Issue
Block a user