Changeset 17754 for trunk


Ignore:
Timestamp:
05/01/14 19:39:24 (11 years ago)
Author:
tbretz
Message:
There were some casts missing to allow large memory sizes
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/mcore/zofits.h

    r17753 r17754  
    9797            fWriteToDiskQueue(std::bind(&zofits::WriteBufferToDisk, this, std::placeholders::_1), false)
    9898        {
    99             InitMemberVariables(numTiles, rowPerTile, maxUsableMem*1000);
     99            InitMemberVariables(numTiles, rowPerTile, size_t(maxUsableMem)*1000);
    100100            SetNumThreads(DefaultNumThreads());
    101101        }
    … …  
    109109               uint32_t rowPerTile  = DefaultNumRowsPerTile(),
    110110               uint32_t maxUsableMem= DefaultMaxMemory()) : ofits(),
    111             fMemPool(0, maxUsableMem*1000),
     111            fMemPool(0, size_t(maxUsableMem)*1000),
    112112            fWriteToDiskQueue(std::bind(&zofits::WriteBufferToDisk, this, std::placeholders::_1), false)
    113113        {
    114114            open(fname);
    115             InitMemberVariables(numTiles, rowPerTile, maxUsableMem*1000);
     115            InitMemberVariables(numTiles, rowPerTile, size_t(maxUsableMem)*1000);
    116116            SetNumThreads(DefaultNumThreads());
    117117        }
    … …  
    121121               uint32_t rowPerTile  = DefaultNumRowsPerTile(),
    122122               uint32_t maxUsableMem= DefaultMaxMemory()) : ofits(),
    123             fMemPool(0, maxUsableMem*1000),
     123            fMemPool(0, size_t(maxUsableMem)*1000),
    124124            fWriteToDiskQueue(std::bind(&zofits::WriteBufferToDisk, this, std::placeholders::_1), false)
    125125        {
    126126            open(fname);
    127             InitMemberVariables(numTiles, rowPerTile, maxUsableMem*1000);
     127            InitMemberVariables(numTiles, rowPerTile, size_t(maxUsableMem)*1000);
    128128            SetNumThreads(DefaultNumThreads());
    129129        }
Note: See TracChangeset for help on using the changeset viewer.