[Libreoffice-commits] core.git: include/o3tl

[Noel Grandin]

 include/o3tl/typed_flags_set.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a6b01d01f77f84517d267bdfe31de91b9050a70c
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Oct 23 09:18:19 2014 +0200

    gcc4.7.3 complains about the asserts
    
    'error: comparison is always true due to limited range of data type'
    
    So just make the underlying type be 'signed int'
    
    Change-Id: Ibf4ff72d85d33e88b7506289c622d34773ca259a

diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx
index 016f8eb..4622d41e 100644
--- a/include/o3tl/typed_flags_set.hxx
+++ b/include/o3tl/typed_flags_set.hxx
@@ -29,9 +29,9 @@ namespace o3tl {
 
 template<typename T> struct typed_flags {};
 
-#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 6 && \
+#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 7 && \
     !defined __clang__
-#define O3TL_STD_UNDERLYING_TYPE_E unsigned int
+#define O3TL_STD_UNDERLYING_TYPE_E signed int
 #else
 #define O3TL_STD_UNDERLYING_TYPE_E typename std::underlying_type<E>::type
 #endif