fix warning in bucketing

patflick · Mar 25, 2016 · 9403ce4 · 9403ce4
1 parent f967540
commit 9403ce4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gtest/mxx_gtest_main.cpp b/gtest/mxx_gtest_main.cpp
@@ -34,6 +34,7 @@ int main(int argc, char* argv[]) {
  ::testing::InitGoogleTest(&argc, argv);
 
  mxx::env e(argc, argv);
+ mxx::env::set_exception_on_error();
  mxx::comm c = mxx::comm();
  //MPI_Init(&argc, &argv);
 

diff --git a/include/mxx/algos.hpp b/include/mxx/algos.hpp
@@ -228,7 +228,7 @@ std::vector<size_t> bucketing(std::vector<T>& input, Func key_func, size_t num_b
 
  // [1st pass]: counting the number of elements per bucket
  for (auto it = input.begin(); it != input.end(); ++it) {
- MXX_ASSERT(0 <= key_func(*it) && key_func(*it) < num_buckets);
+ MXX_ASSERT(0 <= key_func(*it) && (size_t)key_func(*it) < num_buckets);
  bucket_counts[key_func(*it)]++;
  }
 
@@ -278,7 +278,7 @@ std::vector<size_t> bucketing_inplace(std::vector<T>& input, Func key_func, size
 
  // [1st pass]: counting the number of elements per bucket
  for (auto it = input.begin(); it != input.end(); ++it) {
- MXX_ASSERT(0 <= key_func(*it) && key_func(*it) < num_buckets);
+ MXX_ASSERT(0 <= key_func(*it) && (size_t)key_func(*it) < num_buckets);
  bucket_counts[key_func(*it)]++;
  }
  // get exclusive prefix sum