Fixed O3 compilation issues

Markus-Goetz · Jun 23, 2017 · b76366c · b76366c
1 parent 78888c9
commit b76366c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(Threads REQUIRED)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -instrument ${MPI_CXX_COMPILER}")
 
 set(CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-set(CMAKE_BUILD_TYPE RELWITHDEBINFO)
+set(CMAKE_BUILD_TYPE RELEASE)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
 

diff --git a/distributed_max_tree.h b/distributed_max_tree.h
@@ -125,7 +125,9 @@ class DistributedMaxTree {
 
             // find the mapping rules
             for (int i = static_cast<int>(parents->width()), j = 0; i < *len; ++i, ++j) {
-                auto minmax = std::minmax(MaxTree::canonize(*area, in[i]), MaxTree::canonize(*area, out[j]));
+                U left_canonized = MaxTree::canonize(*area, in[i]);
+                U right_canonized = MaxTree::canonize(*area, out[j]);
+                auto minmax = std::minmax(left_canonized, right_canonized);
                 if (minmax.first != minmax.second) (*area)[minmax.second] = minmax.first;
             }