@@ -370,7 +370,7 @@ template <typename T, std::size_t N> void test_all() {
370370}
371371
372372template <typename T>
373- T construct_vec (std::initializer_list<typename T::value_type> il) {
373+ T vec_of (std::initializer_list<typename T::value_type> il) {
374374#if BEMAN_INPLACE_VECTOR_FREESTANDING_DELETED()
375375 T vec;
376376 for (auto &v : il) {
@@ -849,7 +849,7 @@ int main() {
849849
850850 { // erase
851851 {
852- auto l1 = construct_vec <vector<int , 4 >>({1 , 2 , 3 });
852+ auto l1 = vec_of <vector<int , 4 >>({1 , 2 , 3 });
853853 CHECK (l1.size () == 3 );
854854 vector<int , 4 >::const_iterator i = l1.begin ();
855855 ++i;
@@ -874,38 +874,38 @@ int main() {
874874 { // erase iter iter
875875 using vec_t = vector<int , 5 >;
876876 {
877- auto l1 = construct_vec <vec_t >({1 , 2 , 3 });
877+ auto l1 = vec_of <vec_t >({1 , 2 , 3 });
878878 vec_t ::iterator i = l1.erase (l1.cbegin (), l1.cbegin ());
879879 CHECK (l1.size () == 3 );
880880 CHECK (std::distance (l1.cbegin (), l1.cend ()) == 3 );
881881 CHECK (i == l1.begin ());
882882 }
883883 {
884- auto l1 = construct_vec <vec_t >({1 , 2 , 3 });
884+ auto l1 = vec_of <vec_t >({1 , 2 , 3 });
885885 vec_t ::iterator i = l1.erase (l1.cbegin (), std::next (l1.cbegin ()));
886886 CHECK (l1.size () == 2 );
887887 CHECK (std::distance (l1.cbegin (), l1.cend ()) == 2 );
888888 CHECK (i == l1.begin ());
889- CHECK (l1 == construct_vec <vec_t >({2 , 3 }));
889+ CHECK (l1 == vec_of <vec_t >({2 , 3 }));
890890 }
891891 {
892- auto l1 = construct_vec <vec_t >({1 , 2 , 3 });
892+ auto l1 = vec_of <vec_t >({1 , 2 , 3 });
893893 vec_t ::iterator i = l1.erase (l1.cbegin (), std::next (l1.cbegin (), 2 ));
894894 CHECK (l1.size () == 1 );
895895 CHECK (std::distance (l1.cbegin (), l1.cend ()) == 1 );
896896 CHECK (i == l1.begin ());
897- CHECK (l1 == construct_vec <vec_t >({3 }));
897+ CHECK (l1 == vec_of <vec_t >({3 }));
898898 }
899899 {
900- auto l1 = construct_vec <vec_t >({1 , 2 , 3 });
900+ auto l1 = vec_of <vec_t >({1 , 2 , 3 });
901901 vec_t ::iterator i = l1.erase (l1.cbegin (), std::next (l1.cbegin (), 3 ));
902902 CHECK (l1.empty ());
903903 CHECK (std::distance (l1.cbegin (), l1.cend ()) == 0 );
904904 CHECK (i == l1.begin ());
905905 }
906906 {
907- auto outer = construct_vec<vector< vec_t , 3 >>(
908- {construct_vec <vec_t >({1 }), construct_vec <vec_t >({1 })});
907+ auto outer =
908+ vec_of<vector< vec_t , 3 >>({vec_of <vec_t >({1 }), vec_of <vec_t >({1 })});
909909 outer.erase (outer.begin (), outer.begin ());
910910 CHECK (outer.size () == 2 );
911911 CHECK (outer[0 ].size () == 1 );
0 commit comments