Merge branch 'master' of https://github.com/dmlc/ps-lite

Conflicts: src/system/manager.cc
zxh1993 · May 27, 2015 · 4bf6ead · 4bf6ead
2 parents 9b132cb + e8e22f0
commit 4bf6ead
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 485 deletions.
diff --git a/src/base/range.h b/src/base/range.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <limits>
 #include "proto/range.pb.h"
 #include "glog/logging.h"
 
@@ -90,8 +91,8 @@ class Range {
   }
 
   static Range All() {
-    CHECK_GT((T)-1, 0) << "it is a not unsigned integer";
-    return Range(0, (T)-1);
+    return Range(std::numeric_limits<T>::min(),
+                 std::numeric_limits<T>::max());
   }
  private:
   T begin_;

diff --git a/src/system/assigner.cc b/src/system/assigner.cc
diff --git a/src/system/dashboard.cc b/src/system/dashboard.cc
diff --git a/src/system/dashboard.h b/src/system/dashboard.h
diff --git a/src/system/heartbeat_info.cc b/src/system/heartbeat_info.cc