Ignore:
Timestamp:
Feb 21, 2016, 1:05:57 PM (4 years ago)
Author:
nmedfort
Message:

Check in of misc changes prior to symbol table work.

Location:
icGREP/icgrep-devel/icgrep/include/simd-lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/include/simd-lib/bitblock_iterator.hpp

    r4033 r4937  
    245245
    246246protected:
    247         Scanner(): strm(NULL), pos(EOS), blk(-1), scan_blk(-1) {}
     247        Scanner(): strm(nullptr), pos(EOS), blk(-1), scan_blk(-1) {}
    248248        Scanner(const bitblock_t * s, uint32_t start_pos, uint32_t start_blk, scanblock_t start_scan_blk): strm(s), pos(start_pos), blk(start_blk), scan_blk(start_scan_blk) {}
    249249
     
    511511{
    512512public:
    513         BitStreamIterator():pos(EOS), blk(-1), blk_pos(-1), strm(NULL), scan_blk(-1), scan_blk_cnt(0)
     513        BitStreamIterator():pos(EOS), blk(-1), blk_pos(-1), strm(nullptr), scan_blk(-1), scan_blk_cnt(0)
    514514        {
    515515                // default constructor defines past-the-end of bit stream semantics, pos == EOS
  • icGREP/icgrep-devel/icgrep/include/simd-lib/builtins.hpp

    r3850 r4937  
    1313#include "config.hpp"
    1414
    15 static IDISA_ALWAYS_INLINE long likely(long x);
    16 static IDISA_ALWAYS_INLINE long unlikely(long x);
     15static IDISA_ALWAYS_INLINE long LIKELY(long x);
     16static IDISA_ALWAYS_INLINE long UNLIKELY(long x);
    1717
    1818#if defined (_MSC_VER)
     
    2626#elif defined (__GNUC__)
    2727
    28         IDISA_ALWAYS_INLINE long likely(long x) {
     28        IDISA_ALWAYS_INLINE long LIKELY(long x) {
    2929                return __builtin_expect(x, 1);
    3030        }
    3131
    32         IDISA_ALWAYS_INLINE long unlikely(long x) {
     32        IDISA_ALWAYS_INLINE long UNLIKELY(long x) {
    3333                return __builtin_expect(x, 0);
    3434        }
Note: See TracChangeset for help on using the changeset viewer.