Cosmetic changes

Author: flanglet

src/Global.hpp

@@ -94,9 +94,7 @@ namespace kanzi {
            unsigned long res;
            _BitScanReverse(&res, x);
            return int(res);
-       #elif defined(__GNUG__)
-           return 31 ^ __builtin_clz(x);
-       #elif defined(__clang__)
+       #elif defined(__GNUG__) || defined(__clang__)
            return 31 ^ __builtin_clz(x);
        #else
            int res = 0;
@@ -123,9 +121,7 @@ namespace kanzi {
            unsigned long res;
            _BitScanReverse64(&res, x);
            return int(res);
-       #elif defined(__GNUG__)
-           return 63 ^ __builtin_clzll(x);
-       #elif defined(__clang__)
+       #elif defined(__GNUG__) || defined(__clang__)
            return 63 ^ __builtin_clzll(x);
        #else
            int res = 0;
@@ -157,12 +153,10 @@ namespace kanzi {
            unsigned long res;
            _BitScanForward(&res, x);
            return int(res);
-       #elif defined(__GNUG__)
-           return __builtin_ctz(x);
-       #elif defined(__clang__)
+       #elif defined(__GNUG__) || defined(__clang__)
            return __builtin_ctz(x);
        #else
-           return _log2((x & (~x + 1)) - 1);
+           return _log2(x & (~x + 1));
        #endif
    }
 
@@ -174,12 +168,10 @@ namespace kanzi {
            unsigned long res;
            _BitScanForward64(&res, x);
            return int(res);
-       #elif defined(__GNUG__)
-           return __builtin_ctzll(x);
-       #elif defined(__clang__)
+       #elif defined(__GNUG__) || defined(__clang__)
            return __builtin_ctzll(x);
        #else
-           return _log2((x & (~x + 1)) - 1);
+           return _log2(x & (~x + 1));
        #endif
    }
 }

src/types.hpp

@@ -27,11 +27,11 @@ limitations under the License.
     #endif
 
 
-    #ifdef _MSC_VER
+    #if defined(_MSC_VER)
         #include <intrin.h>
         #define popcount __popcnt
     #else
-        #ifdef  __INTEL_COMPILER
+        #if defined(__INTEL_COMPILER)
             #include <intrin.h>
             #define popcount _popcnt32
         #else
@@ -132,7 +132,7 @@ limitations under the License.
     // the extra option /Zc:__cplusplus is added to the command line).
     // Otherwise, using the _MSVC_LANG macro returns the proper C++ version.
     #if __cplusplus >= 201103L
-       // C++ 11
+       // C++ 11 or higher
        #define FINAL final
        #define NOEXCEPT noexcept
        #include <cstdint>
@@ -172,10 +172,9 @@ limitations under the License.
              #endif
        #endif
 
-
-      #if !defined(nullptr)
+       #if !defined(nullptr)
           #define nullptr NULL
-      #endif
+       #endif
     #endif
 
 #if __cplusplus >= 201703L