Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:boostorg/container into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
igaztanaga committed Sep 9, 2024
2 parents 12afa84 + 13180fd commit f2fb40f
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions test/flat_map_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,8 @@ int main()
boost::has_trivial_destructor_after_move<tree>::value
, "has_trivial_destructor_after_move(flat_map, vector) test failed");
}
//Old GCCs have problems (compiler bugs) with std::vector and flat_xxx
#if !defined(BOOST_GCC) || (BOOST_GCC < 50000)
// flat_map, std::vector
{
typedef std::vector<value_t> alloc_or_cont_t;
Expand All @@ -621,6 +623,7 @@ int main()
boost::has_trivial_destructor_after_move<tree>::value
, "has_trivial_destructor_after_move(flat_map, std::vector) test failed");
}
#endif
// flat_multimap, default
{
typedef boost::container::new_allocator<value_t> alloc_or_cont_t;
Expand All @@ -639,6 +642,8 @@ int main()
boost::has_trivial_destructor_after_move<tree>::value
, "has_trivial_destructor_after_move(flat_multimap, vector) test failed");
}
//Old GCCs have problems (compiler bugs) with std::vector and flat_xxx
#if !defined(BOOST_GCC) || (BOOST_GCC < 50000)
// flat_multimap, std::vector
{
typedef std::vector<value_t> alloc_or_cont_t;
Expand All @@ -648,6 +653,7 @@ int main()
boost::has_trivial_destructor_after_move<tree>::value
, "has_trivial_destructor_after_move(flat_multimap, std::vector) test failed");
}
#endif
}

return 0;
Expand Down

0 comments on commit f2fb40f

Please sign in to comment.