Changes in / [7ca8441c:fb16d5c]

File:

• src/Common/utility.h (modified) (1 diff)

src/Common/utility.h

@@ -441 +441 @@
 
 template<typename T>
-inline
-#if __GNUC__ > 4
-constexpr
-#endif
-T ilog2(const T & t) {
-        if(std::is_integral<T>::value) {
+inline constexpr T ilog2(const T & t) {
+        if ( std::is_integral<T>::value ) {
                 const constexpr int r = sizeof(t) * __CHAR_BIT__ - 1;
-                if( sizeof(T) == sizeof(unsigned       int) ) return r - __builtin_clz  ( t );
-                if( sizeof(T) == sizeof(unsigned      long) ) return r - __builtin_clzl ( t );
-                if( sizeof(T) == sizeof(unsigned long long) ) return r - __builtin_clzll( t );
-        }
-        assert(false);
+                if ( sizeof(T) == sizeof(unsigned int ) ) return r - __builtin_clz( t );
+                if ( sizeof(T) == sizeof(unsigned long) ) return r - __builtin_clzl( t );
+                if ( sizeof(T) == sizeof(unsigned long long) ) return r - __builtin_clzll( t );
+        } // if
         return -1;
-} // iLog2
+} // ilong2