Merge pull request #132 from klevzoff/bugfix/tuple-converting-ctor

LLNL · May 22, 2023 · 240fb03 · 240fb03
2 parents 1744f66 + 34b8eca
commit 240fb03
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/include/camp/tuple.hpp b/include/camp/tuple.hpp
@@ -326,13 +326,17 @@ struct tuple {
   {
   }
 
-  template <typename... RTypes>
+  template <typename... RTypes,
+            typename std::enable_if<
+                sizeof...(RTypes) == sizeof...(Elements)>::type* = nullptr>
   CAMP_HOST_DEVICE constexpr explicit tuple(const tuple<RTypes...>& rhs)
       : base(internal::expand_tag{}, rhs)
   {
   }
 
-  template <typename... RTypes>
+  template <typename... RTypes,
+            typename std::enable_if<
+                sizeof...(RTypes) == sizeof...(Elements)>::type* = nullptr>
   CAMP_HOST_DEVICE constexpr explicit tuple(tuple<RTypes...>&& rhs)
       : base(internal::expand_tag{}, rhs)
   {

diff --git a/test/tuple.cpp b/test/tuple.cpp
@@ -197,6 +197,10 @@ static_assert(
     "can by trivially copy constructed");
 #endif
 
+// Test to ensure correct constructor is invoked when constructing from a single tuple argument
+static_assert(std::is_same<decltype(camp::make_tuple(camp::make_tuple(A{}, B{}))), camp::tuple<camp::tuple<A, B>>>::value,
+              "Avoids conversion constructor for a single tuple argument");
+
 // Execution tests
 
 TEST(CampTuple, AssignCompat)