mirror of
https://github.com/catchorg/Catch2.git
synced 2025-09-14 17:35:39 +02:00
Merge branch 'master' of https://github.com/gnzlbg/Catch
# By gnzlbg # Via gnzlbg * 'master' of https://github.com/gnzlbg/Catch: Conditionally removes usage of deprecated features Conflicts (resolved): include/internal/catch_common.h include/internal/catch_section.hpp
This commit is contained in:
@@ -96,5 +96,28 @@
|
||||
|
||||
#endif
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// C++ language feature support
|
||||
|
||||
// detect language version:
|
||||
#if (__cplusplus == 201103L)
|
||||
# define CATCH_CPP11
|
||||
# define CATCH_CPP11_OR_GREATER
|
||||
#elif (__cplusplus >= 201103L)
|
||||
# define CATCH_CPP11_OR_GREATER
|
||||
#endif
|
||||
|
||||
// noexcept support:
|
||||
#ifdef CATCH_CPP11_OR_GREATER
|
||||
# if (__has_feature(cxx_noexcept))
|
||||
# define CATCH_NOEXCEPT noexcept
|
||||
# define CATCH_NOEXCEPT_IS(x) noexcept(x)
|
||||
# endif
|
||||
#endif
|
||||
#ifndef CATCH_NO_EXCEPT
|
||||
# define CATCH_NOEXCEPT throw()
|
||||
# define CATCH_NOEXCEPT_IS(x)
|
||||
#endif
|
||||
|
||||
#endif // TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
|
||||
|
||||
|
Reference in New Issue
Block a user