mirror of
https://github.com/fmtlib/fmt.git
synced 2025-04-25 12:02:32 +00:00
Revert "Reorder defines"
This reverts commit 4a059914a965485cfac89145d7f5ba70612f60f0.
This commit is contained in:
parent
4a059914a9
commit
dde095fab8
@ -144,9 +144,6 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef FMT_BEGIN_NAMESPACE
|
#ifndef FMT_BEGIN_NAMESPACE
|
||||||
# define FMT_BEGIN_NAMESPACE \
|
|
||||||
namespace fmt { \
|
|
||||||
FMT_INLINE_NAMESPACE v5 {
|
|
||||||
# if FMT_HAS_FEATURE(cxx_inline_namespaces) || FMT_GCC_VERSION >= 404 || \
|
# if FMT_HAS_FEATURE(cxx_inline_namespaces) || FMT_GCC_VERSION >= 404 || \
|
||||||
FMT_MSC_VER >= 1900
|
FMT_MSC_VER >= 1900
|
||||||
# define FMT_INLINE_NAMESPACE inline namespace
|
# define FMT_INLINE_NAMESPACE inline namespace
|
||||||
@ -160,6 +157,9 @@
|
|||||||
using namespace v5; \
|
using namespace v5; \
|
||||||
}
|
}
|
||||||
# endif
|
# endif
|
||||||
|
# define FMT_BEGIN_NAMESPACE \
|
||||||
|
namespace fmt { \
|
||||||
|
FMT_INLINE_NAMESPACE v5 {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
|
#if !defined(FMT_HEADER_ONLY) && defined(_WIN32)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user