TartanLlama/optional
1
0
Fork 1
mirror of https://github.com/TartanLlama/optional.git synced 2025-07-31 18:34:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

More constexpr fixes

Browse Source
This commit is contained in:
Simon Brand
2017-10-24 15:59:38 +01:00
parent ae88cda44a
commit 09249f3be0
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
optional.hpp
View File

@@ -28,6 +28,10 @@
#define TL_OPTIONAL_GCC49 #define TL_OPTIONAL_GCC49
#endif #endif
#if (defined(__GNUC__) && __GNUC__ == 5 && __GNUC_MINOR__ == 0)
#define TL_OPTIONAL_GCC50
#endif
#if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9) #if (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 9)
#define TL_OPTIONAL_NO_CONSTRR #define TL_OPTIONAL_NO_CONSTRR
#endif #endif
@@ -36,8 +40,9 @@
#define TL_OPTIONAL_CXX14 #define TL_OPTIONAL_CXX14
#endif #endif
#if __cplusplus == 201103L || defined(TL_OPTIONAL_MSVC2015) || \ #if (__cplusplus == 201103L || defined(TL_OPTIONAL_MSVC2015) || \
defined(TL_OPTIONAL_GCC49) defined(TL_OPTIONAL_GCC49)) && \
!defined(TL_OPTIONAL_GCC50)
/// \exclude /// \exclude
#define TL_OPTIONAL_11_CONSTEXPR #define TL_OPTIONAL_11_CONSTEXPR
#else #else