Commit 4d695b04fa978b9612b01f7c6c8a36968b365057
Committed by
Henry Schreiner
1 parent
ae3b5a69
Style fix
Showing
1 changed file
with
12 additions
and
12 deletions
include/CLI/Macros.hpp
| @@ -10,20 +10,20 @@ namespace CLI { | @@ -10,20 +10,20 @@ namespace CLI { | ||
| 10 | // The following version macro is very similar to the one in PyBind11 | 10 | // The following version macro is very similar to the one in PyBind11 |
| 11 | 11 | ||
| 12 | #if !defined(_MSC_VER) && !defined(__INTEL_COMPILER) | 12 | #if !defined(_MSC_VER) && !defined(__INTEL_COMPILER) |
| 13 | -# if __cplusplus >= 201402L | ||
| 14 | -# define CLI11_CPP14 | ||
| 15 | -# if __cplusplus > 201402L /* Temporary: should be updated to >= the final C++17 value once known */ | ||
| 16 | -# define CLI11_CPP17 | ||
| 17 | -# endif | ||
| 18 | -# endif | 13 | +#if __cplusplus >= 201402L |
| 14 | +#define CLI11_CPP14 | ||
| 15 | +#if __cplusplus > 201402L /* Temporary: should be updated to >= the final C++17 value once known */ | ||
| 16 | +#define CLI11_CPP17 | ||
| 17 | +#endif | ||
| 18 | +#endif | ||
| 19 | #elif defined(_MSC_VER) | 19 | #elif defined(_MSC_VER) |
| 20 | // MSVC sets _MSVC_LANG rather than __cplusplus (supposedly until the standard is fully implemented) | 20 | // MSVC sets _MSVC_LANG rather than __cplusplus (supposedly until the standard is fully implemented) |
| 21 | -# if _MSVC_LANG >= 201402L | ||
| 22 | -# define CLI11_CPP14 | ||
| 23 | -# if _MSVC_LANG > 201402L && _MSC_VER >= 1910 | ||
| 24 | -# define CLI11_CPP17 | ||
| 25 | -# endif | ||
| 26 | -# endif | 21 | +#if _MSVC_LANG >= 201402L |
| 22 | +#define CLI11_CPP14 | ||
| 23 | +#if _MSVC_LANG > 201402L && _MSC_VER >= 1910 | ||
| 24 | +#define CLI11_CPP17 | ||
| 25 | +#endif | ||
| 26 | +#endif | ||
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||
| 29 | } // namespace CLI | 29 | } // namespace CLI |