boost/container
2
0
Fork 0
mirror of https://github.com/boostorg/container.git synced 2026-02-22 15:22:14 +00:00
Code Issues Projects Releases Wiki Activity

Protect CTAD from old clang compilers that suffer from ICE

Browse Source
This commit is contained in:
Ion Gaztañaga
2026-02-03 15:50:39 +01:00
parent 65f7bba30d
commit 8ed60bcbe1
2 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/deque_test.cpp
View File

@@ -307,24 +307,31 @@ bool do_test()
if(!test::CheckEqualContainers(cntc, stdc)) return 1;
}
#ifndef BOOST_CONTAINER_NO_CXX17_CTAD
//Check Constructor Template Auto Deduction
{
auto gold = MyStd{ 1, 2, 3 };
auto test = deque(gold.begin(), gold.end());
if(!test::CheckEqualContainers(gold, test)) return false;
}
{
auto gold = MyStd{ 1, 2, 3 };
auto test = deque(gold.begin(), gold.end(), new_allocator<int>());
if(!test::CheckEqualContainers(gold, test)) return false;
}
#endif
std::cout << std::endl << "Test OK!" << std::endl;
return true;
}
bool test_ctad() //Older clang versions suffer from ICE here
#if !defined(BOOST_CONTAINER_NO_CXX17_CTAD) && (!defined(BOOST_CLANG) || (BOOST_CLANG_VERSION >= 80000))
{
typedef std::vector<int> MyStd;
//Check Constructor Template Auto Deduction
{
MyStd gold = MyStd{ 1, 2, 3 };
deque<int> test = deque(gold.begin(), gold.end());
if (!test::CheckEqualContainers(gold, test)) return false;
}
{
MyStd gold = MyStd{ 1, 2, 3 };
deque<int> test = deque<int>(gold.begin(), gold.end(), new_allocator<int>());
if (!test::CheckEqualContainers(gold, test)) return false;
}
return true;
}
#else
{ return true; }
#endif
template<class VoidAllocator, bool Reservable>
struct GetAllocatorCont
{
@@ -434,6 +441,9 @@ int main ()
if(!do_test<test::copyable_int, true>())
return 1;
if (!test_ctad())
return 1;
//Default block size
if(!do_test_default_block_size())
return 1;

38
test/segmented_vector_test.cpp
View File

@@ -295,24 +295,31 @@ bool do_test()
if(!test::CheckEqualContainers(cntc, stdc)) return 1;
}
#ifndef BOOST_CONTAINER_NO_CXX17_CTAD
//Check Constructor Template Auto Deduction
{
auto gold = MyStd{ 1, 2, 3 };
auto test = segmented_vector(gold.begin(), gold.end());
if(!test::CheckEqualContainers(gold, test)) return false;
}
{
auto gold = MyStd{ 1, 2, 3 };
auto test = segmented_vector(gold.begin(), gold.end(), new_allocator<int>());
if(!test::CheckEqualContainers(gold, test)) return false;
}
#endif
std::cout << std::endl << "Test OK!" << std::endl;
return true;
}
bool test_ctad() //Older clang versions suffer from ICE here
#if !defined(BOOST_CONTAINER_NO_CXX17_CTAD) && (!defined(BOOST_CLANG) || (BOOST_CLANG_VERSION >= 80000))
{
typedef std::vector<int> MyStd;
//Check Constructor Template Auto Deduction
{
MyStd gold = MyStd{ 1, 2, 3 };
segmented_vector<int> test = segmented_vector(gold.begin(), gold.end());
if (!test::CheckEqualContainers(gold, test)) return false;
}
{
MyStd gold = MyStd{ 1, 2, 3 };
segmented_vector<int> test = segmented_vector<int>(gold.begin(), gold.end(), new_allocator<int>());
if (!test::CheckEqualContainers(gold, test)) return false;
}
return true;
}
#else
{ return true; }
#endif
template<class VoidAllocator, bool Reservable>
struct GetAllocatorCont
{
@@ -426,6 +433,9 @@ int main ()
if(!do_test_default_block_size())
return 1;
if (!test_ctad())
return 1;
//Test non-copy-move operations (back only; no emplace_front)
{
segmented_vector<test::non_copymovable_int> d;