Changes in src/Common/utility.h [f14d956:b6d7f44]

File:

• src/Common/utility.h (modified) (2 diffs)

src/Common/utility.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 20 22:35:33 2018
-// Update Count     : 38
+// Last Modified On : Sun May  6 22:24:16 2018
+// Update Count     : 40
 //
 
@@ -441 +441 @@
 
 template<typename T>
-inline constexpr T ilog2(const T & t) {
-        if ( std::is_integral<T>::value ) {
+inline
+#if defined(__GNUC__) && __GNUC__ > 4
+constexpr
+#endif
+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 );
-        } // if
+                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);
         return -1;
-} // ilong2
+} // ilog2