diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-05-09 10:37:47 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-05-09 10:41:40 +0200 |
| commit | 973d038193574d0309c1cfd44618f431c8c25732 (patch) | |
| tree | 55845b012c52d1dc7801fce5ceb8ad8a298ab7e7 /include/o3tl | |
| parent | 4048311aae6993357c2d0be1f1968a8c57dd4e85 (diff) | |
Revert "improve fallback behaviour of underlying_type for old gcc"
This reverts commit 7ad4e562b462af22a1c29c955293238cdb30267b, which
was causing ICEs on precisely the compiler versions it was targetted
at.
Change-Id: I996792d723a8bd0d7edd5f248d74217322b5ce3f
Diffstat (limited to 'include/o3tl')
| -rw-r--r-- | include/o3tl/underlying_type.hxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/o3tl/underlying_type.hxx b/include/o3tl/underlying_type.hxx index 534e0883fc7e..4b2e0778ee60 100644 --- a/include/o3tl/underlying_type.hxx +++ b/include/o3tl/underlying_type.hxx @@ -19,11 +19,7 @@ namespace o3tl { template<typename T> struct underlying_type { #if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 6 && \ !defined __clang__ - typedef typename std::conditional< - T( -1 ) < T( 0 ), - typename std::make_signed< T >::type, - typename std::make_unsigned< T >::type - >::type type; + typedef int type; #else typedef typename std::underlying_type<T>::type type; #endif |