Merge remote-tracking branch 'organization/development' into feature-2.0

Conflicts: src/wrappers.hpp
FlexibleSUSY · Feb 1, 2017 · 0a29121 · 0a29121
2 parents 1b543ff + 6bb28e2
commit 0a29121
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/wrappers.hpp b/src/wrappers.hpp
@@ -749,7 +749,7 @@ constexpr T Which(bool cond, T value) noexcept
 }
 
 template<typename T, typename ... Trest>
-constexpr T Which(bool cond, T value, Trest... rest) noexcept
+constexpr typename std::common_type<T, Trest...>::type Which(bool cond, T value, Trest... rest) noexcept
 {
    return cond ? value : Which(rest...);
 }

diff --git a/test/test_wrappers.cpp b/test/test_wrappers.cpp
@@ -298,6 +298,9 @@ BOOST_AUTO_TEST_CASE(test_Which)
    BOOST_CHECK_EQUAL(std::real(Which(true , std::complex<double>(2.,2.))), 2.);
    BOOST_CHECK_EQUAL(Which(false, std::complex<double>(2.,2.), true, 3.), 3.);
    BOOST_CHECK_EQUAL(Which(false, std::complex<double>(2.,2.), false, 3., true, 4.), 4.);
+
+   BOOST_CHECK_EQUAL(Which(false, 0, true, 0.5), 0.5);
+   BOOST_CHECK_EQUAL(Which(false, 0, false, 0, true, 0.5), 0.5);
 }
 
 BOOST_AUTO_TEST_CASE(test_MaxRelDiff)