Changeset 17754 for trunk/Mars/mcore

Timestamp:

05/01/14 19:39:24 (11 years ago)

Author:

tbretz

Message:

There were some casts missing to allow large memory sizes

File:

• trunk/Mars/mcore/zofits.h (modified) (3 diffs)

trunk/Mars/mcore/zofits.h

@@ -97 +97 @@
             fWriteToDiskQueue(std::bind(&zofits::WriteBufferToDisk, this, std::placeholders::_1), false)
         {
-            InitMemberVariables(numTiles, rowPerTile, maxUsableMem*1000);
+            InitMemberVariables(numTiles, rowPerTile, size_t(maxUsableMem)*1000);
             SetNumThreads(DefaultNumThreads());
         }
@@ -109 +109 @@
                uint32_t rowPerTile  = DefaultNumRowsPerTile(),
                uint32_t maxUsableMem= DefaultMaxMemory()) : ofits(),
-            fMemPool(0, maxUsableMem*1000),
+            fMemPool(0, size_t(maxUsableMem)*1000),
             fWriteToDiskQueue(std::bind(&zofits::WriteBufferToDisk, this, std::placeholders::_1), false)
         {
             open(fname);
-            InitMemberVariables(numTiles, rowPerTile, maxUsableMem*1000);
+            InitMemberVariables(numTiles, rowPerTile, size_t(maxUsableMem)*1000);
             SetNumThreads(DefaultNumThreads());
         }
@@ -121 +121 @@
                uint32_t rowPerTile  = DefaultNumRowsPerTile(),
                uint32_t maxUsableMem= DefaultMaxMemory()) : ofits(),
-            fMemPool(0, maxUsableMem*1000),
+            fMemPool(0, size_t(maxUsableMem)*1000),
             fWriteToDiskQueue(std::bind(&zofits::WriteBufferToDisk, this, std::placeholders::_1), false)
         {
             open(fname);
-            InitMemberVariables(numTiles, rowPerTile, maxUsableMem*1000);
+            InitMemberVariables(numTiles, rowPerTile, size_t(maxUsableMem)*1000);
             SetNumThreads(DefaultNumThreads());
         }