Changeset 6230


Ignore:
Timestamp:
Dec 14, 2018, 6:35:12 PM (3 months ago)
Author:
cameron
Message:

Resolve conflict with Mac OS system macro PAGE_SIZE

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/kernels/source_kernel.cpp

    r6228 r6230  
    8282    BasicBlock * const exit = b->CreateBasicBlock("mmapSourceExit");
    8383
    84     Constant * const PAGE_SIZE = b->getSize(getPageSize());
     84    Constant * const MMAP_PAGE_SIZE = b->getSize(getPageSize());
    8585
    8686    Constant * const STRIDE_SIZE = b->getSize(stride);
     
    9393    Value * const consumedItems = b->getConsumedItemCount("sourceBuffer");
    9494    Value * const consumedBytes = b->CreateMul(consumedItems, CODE_UNIT_BYTES);
    95     Value * const consumedPageOffset = b->CreateAnd(consumedBytes, ConstantExpr::getNeg(PAGE_SIZE));
     95    Value * const consumedPageOffset = b->CreateAnd(consumedBytes, ConstantExpr::getNeg(MMAP_PAGE_SIZE));
    9696    Value * const consumedBuffer = b->getRawOutputPointer("sourceBuffer", consumedPageOffset);
    9797    Value * const readableBuffer = b->getScalarField("buffer");
Note: See TracChangeset for help on using the changeset viewer.