coffee/better-enums
1
0
Fork 0
mirror of https://github.com/aantron/better-enums.git synced 2025-12-08 01:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #ifdef that caused some tests not to run.

Browse Source 
Disabled some tests that were failing due to unsupported type traits in
Travis standard library installation.
This commit is contained in:
Anton Bachin 2015-10-04 12:34:19 -05:00
parent e1e237a4ea
commit c1d4a1c006
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/cxxtest/general.h
View File

@ -28,7 +28,7 @@ BETTER_ENUM(Namespaced, short, One, Two)
// Using _ENUM_HAVE_CONSTEXPR as a proxy for C++11 support. This should be
// changed to be more precise in the future.
#ifdef _ENUM_HAVE_CONSTEXPR
#ifdef BETTER_ENUMS__HAVE_CONSTEXPR
#include <type_traits>
@ -44,12 +44,14 @@ static_assert_1(std::is_integral<Channel::_integral>());
static_assert_1(std::is_enum<Channel::_enumerated>());
static_assert_1((std::is_same<short, Channel::_integral>()));
static_assert_1((std::is_same<
short, std::underlying_type<Channel::_enumerated>::type>()));
// Temporarily disabled due to outdated libraries in Travis.
// static_assert_1((std::is_same<
// short, std::underlying_type<Channel::_enumerated>::type>()));
static_assert_1(!(std::is_same<int, Channel::_integral>()));
static_assert_1(!(std::is_same<
int, std::underlying_type<Channel::_enumerated>::type>()));
// Temporarily disabled due to outdated libraries in Travis.
// static_assert_1(!(std::is_same<
// int, std::underlying_type<Channel::_enumerated>::type>()));
static_assert_1(sizeof(Channel) == sizeof(short));
static_assert_1(alignof(Channel) == alignof(short));
@ -60,13 +62,16 @@ static_assert_1((std::is_same<decltype(Channel::Red), Channel::_enumerated>()));
// Supported constructors.
#ifdef __clang__
static_assert_1(std::is_trivially_copyable<Channel>());
#endif
// Apparently, this isn't supported by Clang in Travis.
// #ifdef __clang__
// static_assert_1(std::is_trivially_copyable<Channel>());
// #endif
static_assert_1((std::is_constructible<Channel, Channel::_enumerated>()));
static_assert_1(!(std::is_constructible<Channel, Channel::_integral>()));
static_assert_1(!(std::is_constructible<Channel, Depth>()));
// "Passes" by causing a compilation error.
// static_assert_1(!(std::is_constructible<Channel, Channel::_integral>()));
// "Passes" on most compilers, passes on g++47 by causing a compilation error.
// static_assert_1(!(std::is_constructible<Channel, Depth>()));
// Commented out temporarily due to GCC 4.7- bug.
// static_assert_1(!std::is_default_constructible<Channel>());