Changeset 7ca8441c

Timestamp:

May 3, 2018, 12:16:47 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

af39199d

Parents:

fb16d5c (diff), d28a03e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

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

src/Common/utility.h

@@ -441 +441 @@
 
 template<typename T>
-inline constexpr T ilog2(const T & t) {
-        if ( std::is_integral<T>::value ) {
+inline
+#if __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