Merge commit '7258f3353c8cc3ee3dd3c00c987fa0b189e58723'

dennysem · May 2, 2015 · 7297c23 · 7297c23
2 parents 869c68f + 7258f33
commit 7297c23
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/subtree/rabit/src/allreduce_base.cc b/subtree/rabit/src/allreduce_base.cc
@@ -134,8 +134,9 @@ void AllreduceBase::TrackerPrint(const std::string &msg) {
 // util to parse data with unit suffix
 inline size_t ParseUnit(const char *name, const char *val) {
   char unit;
-  uint64_t amount;
-  int n = sscanf(val, "%lu%c", &amount, &unit);
+  unsigned long amt;
+  int n = sscanf(val, "%lu%c", &amt, &unit);
+  size_t amount = amt;
   if (n == 2) {
     switch (unit) {
       case 'B': return amount;