diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-05 20:16:29 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-05 20:16:29 -0700 |
| commit | 7ec146c05489f43dddb1b7af948a193c1cf0a9d1 (patch) | |
| tree | 00d96dfb5723168550ee9ad2ec4a1797cd7a75ce | |
| parent | a7f64f0b39cb7141f16608c171b20bee452fd024 (diff) | |
| download | tmwa-7ec146c05489f43dddb1b7af948a193c1cf0a9d1.tar.gz tmwa-7ec146c05489f43dddb1b7af948a193c1cf0a9d1.tar.bz2 tmwa-7ec146c05489f43dddb1b7af948a193c1cf0a9d1.tar.xz tmwa-7ec146c05489f43dddb1b7af948a193c1cf0a9d1.zip | |
Work around a compiler bug in error checks
| -rw-r--r-- | src/diagnostics.hpp | 1 | ||||
| -rw-r--r-- | src/sexpr/variant.tcc | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/diagnostics.hpp b/src/diagnostics.hpp index 31596dc..dab15b5 100644 --- a/src/diagnostics.hpp +++ b/src/diagnostics.hpp @@ -52,6 +52,7 @@ namespace tmwa # define CLANG (0) # endif #endif +#define GCC_PATCH (GCC * 100 + __GNUC_PATCHLEVEL__) #if GCC >= 406 || CLANG # define PRAGMA(x) _Pragma(#x) static_assert(1, "I like my semicolons") diff --git a/src/sexpr/variant.tcc b/src/sexpr/variant.tcc index ce820bf..69bf191 100644 --- a/src/sexpr/variant.tcc +++ b/src/sexpr/variant.tcc @@ -20,6 +20,8 @@ #include <cassert> #include "bind.hpp" +#include "../diagnostics.hpp" + namespace tmwa { namespace sexpr @@ -116,9 +118,11 @@ namespace sexpr data.template construct<C, A...>(std::forward<A>(a)...); state = not_negative_one<Union<D, T...>::template index<C>()>(); } - catch(...) + catch (...) { +#if GCC_PATCH != 40702 // apparent compiler bug, not reduced static_assert(std::is_nothrow_constructible<D>::value, "first element is nothrow constructible"); +#endif data.template construct<D>(); state = 0; throw; |