Change tuple_size/tuple_element pair specializations to use const.

NVIDIA · Jun 8, 2021 · 54a3d15 · 54a3d15
1 parent 20f1c6a
commit 54a3d15
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/testing/pair.cu b/testing/pair.cu
@@ -218,6 +218,10 @@ void TestPairTupleSize(void)
 {
   int result = thrust::tuple_size< thrust::pair<int,int> >::value;
   ASSERT_EQUAL(2, result);
+
+  // test const pair
+  int const_result = thrust::tuple_size< thrust::pair<int,int> const >::value;
+  ASSERT_EQUAL(2, const_result);
 };
 DECLARE_UNITTEST(TestPairTupleSize);
 
@@ -229,6 +233,13 @@ void TestPairTupleElement(void)
 
   ASSERT_EQUAL_QUIET(typeid(int),   typeid(type0));
   ASSERT_EQUAL_QUIET(typeid(float), typeid(type1));
+
+  // test const pair
+  typedef thrust::tuple_element<0, thrust::pair<int, float> const>::type const_type0;
+  typedef thrust::tuple_element<1, thrust::pair<int, float> const>::type const_type1;
+
+  ASSERT_EQUAL_QUIET(typeid(int const),   typeid(const_type0));
+  ASSERT_EQUAL_QUIET(typeid(float const), typeid(const_type1));
 };
 DECLARE_UNITTEST(TestPairTupleElement);
 

diff --git a/thrust/detail/pair.inl b/thrust/detail/pair.inl
@@ -140,21 +140,21 @@ template <typename T1, typename T2>
 
 // specializations of tuple_element for pair
 template<typename T1, typename T2>
-  struct tuple_element<0, pair<T1,T2> >
+  struct tuple_element<0, const pair<T1,T2> >
 {
   typedef T1 type;
 }; // end tuple_element
 
 template<typename T1, typename T2>
-  struct tuple_element<1, pair<T1,T2> >
+  struct tuple_element<1, const pair<T1,T2> >
 {
   typedef T2 type;
 }; // end tuple_element
 
 
 // specialization of tuple_size for pair
 template<typename T1, typename T2>
-  struct tuple_size< pair<T1,T2 > >
+  struct tuple_size< const pair<T1,T2 > >
 {
   static const unsigned int value = 2;
 }; // end tuple_size