diff --git a/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp b/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp
--- a/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp
+++ b/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp
@@ -26,6 +26,6 @@
 };
 
 static_assert(std::ranges::__nothrow_input_iterator<cpp20_input_iterator<int*>>);
-static_assert(!std::ranges::__nothrow_input_iterator<output_iterator<int*>>);
+static_assert(!std::ranges::__nothrow_input_iterator<cpp17_output_iterator<int*>>);
 static_assert(std::input_iterator<InputProxyIterator>);
 static_assert(!std::ranges::__nothrow_input_iterator<InputProxyIterator>);
diff --git a/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp b/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp
--- a/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp
+++ b/libcxx/test/libcxx/iterators/contiguous_iterators.pass.cpp
@@ -198,7 +198,7 @@
 #endif
 
 //  iterators in the libc++ test suite
-    static_assert((!std::__is_cpp17_contiguous_iterator<output_iterator       <char *> >::value), "");
+    static_assert((!std::__is_cpp17_contiguous_iterator<cpp17_output_iterator <char *> >::value), "");
     static_assert((!std::__is_cpp17_contiguous_iterator<cpp17_input_iterator  <char *> >::value), "");
     static_assert((!std::__is_cpp17_contiguous_iterator<forward_iterator      <char *> >::value), "");
     static_assert((!std::__is_cpp17_contiguous_iterator<bidirectional_iterator<char *> >::value), "");
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
@@ -37,31 +37,31 @@
 TEST_CONSTEXPR_CXX20 bool
 test()
 {
-    test_copy<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test_copy<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test_copy<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test_copy<cpp17_input_iterator<const int*>, int*>();
 
-    test_copy<forward_iterator<const int*>, output_iterator<int*> >();
+    test_copy<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy<forward_iterator<const int*>, forward_iterator<int*> >();
     test_copy<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy<forward_iterator<const int*>, random_access_iterator<int*> >();
     test_copy<forward_iterator<const int*>, int*>();
 
-    test_copy<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test_copy<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test_copy<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test_copy<bidirectional_iterator<const int*>, int*>();
 
-    test_copy<random_access_iterator<const int*>, output_iterator<int*> >();
+    test_copy<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy<random_access_iterator<const int*>, forward_iterator<int*> >();
     test_copy<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test_copy<random_access_iterator<const int*>, int*>();
 
-    test_copy<const int*, output_iterator<int*> >();
+    test_copy<const int*, cpp17_output_iterator<int*> >();
     test_copy<const int*, forward_iterator<int*> >();
     test_copy<const int*, bidirectional_iterator<int*> >();
     test_copy<const int*, random_access_iterator<int*> >();
@@ -74,7 +74,7 @@
     test_copy<random_access_iterator<const int*>, contiguous_iterator<int*>>();
     test_copy<const int*, contiguous_iterator<int*>>();
 
-    test_copy<contiguous_iterator<const int*>, output_iterator<int*>>();
+    test_copy<contiguous_iterator<const int*>, cpp17_output_iterator<int*>>();
     test_copy<contiguous_iterator<const int*>, forward_iterator<int*>>();
     test_copy<contiguous_iterator<const int*>, bidirectional_iterator<int*>>();
     test_copy<contiguous_iterator<const int*>, random_access_iterator<int*>>();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
@@ -44,35 +44,35 @@
 TEST_CONSTEXPR_CXX20 bool
 test()
 {
-    test_copy_if<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test_copy_if<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy_if<cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
     test_copy_if<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test_copy_if<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy_if<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test_copy_if<cpp17_input_iterator<const int*>, int*>();
 
-    test_copy_if<forward_iterator<const int*>, output_iterator<int*> >();
+    test_copy_if<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy_if<forward_iterator<const int*>, cpp17_input_iterator<int*> >();
     test_copy_if<forward_iterator<const int*>, forward_iterator<int*> >();
     test_copy_if<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy_if<forward_iterator<const int*>, random_access_iterator<int*> >();
     test_copy_if<forward_iterator<const int*>, int*>();
 
-    test_copy_if<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test_copy_if<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy_if<bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
     test_copy_if<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test_copy_if<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy_if<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test_copy_if<bidirectional_iterator<const int*>, int*>();
 
-    test_copy_if<random_access_iterator<const int*>, output_iterator<int*> >();
+    test_copy_if<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy_if<random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
     test_copy_if<random_access_iterator<const int*>, forward_iterator<int*> >();
     test_copy_if<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy_if<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test_copy_if<random_access_iterator<const int*>, int*>();
 
-    test_copy_if<const int*, output_iterator<int*> >();
+    test_copy_if<const int*, cpp17_output_iterator<int*> >();
     test_copy_if<const int*, cpp17_input_iterator<int*> >();
     test_copy_if<const int*, forward_iterator<int*> >();
     test_copy_if<const int*, bidirectional_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
@@ -40,35 +40,35 @@
 TEST_CONSTEXPR_CXX20 bool
 test()
 {
-    test_copy_n<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test_copy_n<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy_n<cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
     test_copy_n<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test_copy_n<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy_n<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test_copy_n<cpp17_input_iterator<const int*>, int*>();
 
-    test_copy_n<forward_iterator<const int*>, output_iterator<int*> >();
+    test_copy_n<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy_n<forward_iterator<const int*>, cpp17_input_iterator<int*> >();
     test_copy_n<forward_iterator<const int*>, forward_iterator<int*> >();
     test_copy_n<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy_n<forward_iterator<const int*>, random_access_iterator<int*> >();
     test_copy_n<forward_iterator<const int*>, int*>();
 
-    test_copy_n<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test_copy_n<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy_n<bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
     test_copy_n<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test_copy_n<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy_n<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test_copy_n<bidirectional_iterator<const int*>, int*>();
 
-    test_copy_n<random_access_iterator<const int*>, output_iterator<int*> >();
+    test_copy_n<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test_copy_n<random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
     test_copy_n<random_access_iterator<const int*>, forward_iterator<int*> >();
     test_copy_n<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test_copy_n<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test_copy_n<random_access_iterator<const int*>, int*>();
 
-    test_copy_n<const int*, output_iterator<int*> >();
+    test_copy_n<const int*, cpp17_output_iterator<int*> >();
     test_copy_n<const int*, cpp17_input_iterator<int*> >();
     test_copy_n<const int*, forward_iterator<int*> >();
     test_copy_n<const int*, bidirectional_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
@@ -147,13 +147,13 @@
 
 int main(int, char**)
 {
-    test_char<output_iterator<char*> >();
+    test_char<cpp17_output_iterator<char*> >();
     test_char<forward_iterator<char*> >();
     test_char<bidirectional_iterator<char*> >();
     test_char<random_access_iterator<char*> >();
     test_char<char*>();
 
-    test_int<output_iterator<int*> >();
+    test_int<cpp17_output_iterator<int*> >();
     test_int<forward_iterator<int*> >();
     test_int<bidirectional_iterator<int*> >();
     test_int<random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
@@ -58,62 +58,62 @@
 
 int main(int, char**)
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
     test<const int*, int*>();
 
 #if TEST_STD_VER >= 11
-    test1<cpp17_input_iterator<std::unique_ptr<int>*>, output_iterator<std::unique_ptr<int>*> >();
+    test1<cpp17_input_iterator<std::unique_ptr<int>*>, cpp17_output_iterator<std::unique_ptr<int>*> >();
     test1<cpp17_input_iterator<std::unique_ptr<int>*>, forward_iterator<std::unique_ptr<int>*> >();
     test1<cpp17_input_iterator<std::unique_ptr<int>*>, bidirectional_iterator<std::unique_ptr<int>*> >();
     test1<cpp17_input_iterator<std::unique_ptr<int>*>, random_access_iterator<std::unique_ptr<int>*> >();
     test1<cpp17_input_iterator<std::unique_ptr<int>*>, std::unique_ptr<int>*>();
 
-    test1<forward_iterator<std::unique_ptr<int>*>, output_iterator<std::unique_ptr<int>*> >();
+    test1<forward_iterator<std::unique_ptr<int>*>, cpp17_output_iterator<std::unique_ptr<int>*> >();
     test1<forward_iterator<std::unique_ptr<int>*>, forward_iterator<std::unique_ptr<int>*> >();
     test1<forward_iterator<std::unique_ptr<int>*>, bidirectional_iterator<std::unique_ptr<int>*> >();
     test1<forward_iterator<std::unique_ptr<int>*>, random_access_iterator<std::unique_ptr<int>*> >();
     test1<forward_iterator<std::unique_ptr<int>*>, std::unique_ptr<int>*>();
 
-    test1<bidirectional_iterator<std::unique_ptr<int>*>, output_iterator<std::unique_ptr<int>*> >();
+    test1<bidirectional_iterator<std::unique_ptr<int>*>, cpp17_output_iterator<std::unique_ptr<int>*> >();
     test1<bidirectional_iterator<std::unique_ptr<int>*>, forward_iterator<std::unique_ptr<int>*> >();
     test1<bidirectional_iterator<std::unique_ptr<int>*>, bidirectional_iterator<std::unique_ptr<int>*> >();
     test1<bidirectional_iterator<std::unique_ptr<int>*>, random_access_iterator<std::unique_ptr<int>*> >();
     test1<bidirectional_iterator<std::unique_ptr<int>*>, std::unique_ptr<int>*>();
 
-    test1<random_access_iterator<std::unique_ptr<int>*>, output_iterator<std::unique_ptr<int>*> >();
+    test1<random_access_iterator<std::unique_ptr<int>*>, cpp17_output_iterator<std::unique_ptr<int>*> >();
     test1<random_access_iterator<std::unique_ptr<int>*>, forward_iterator<std::unique_ptr<int>*> >();
     test1<random_access_iterator<std::unique_ptr<int>*>, bidirectional_iterator<std::unique_ptr<int>*> >();
     test1<random_access_iterator<std::unique_ptr<int>*>, random_access_iterator<std::unique_ptr<int>*> >();
     test1<random_access_iterator<std::unique_ptr<int>*>, std::unique_ptr<int>*>();
 
-    test1<std::unique_ptr<int>*, output_iterator<std::unique_ptr<int>*> >();
+    test1<std::unique_ptr<int>*, cpp17_output_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*, forward_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*, bidirectional_iterator<std::unique_ptr<int>*> >();
     test1<std::unique_ptr<int>*, random_access_iterator<std::unique_ptr<int>*> >();
@@ -126,7 +126,7 @@
     test<bidirectional_iterator<const int*>, contiguous_iterator<int*>>();
     test<random_access_iterator<const int*>, contiguous_iterator<int*>>();
     test<const int*, contiguous_iterator<int*>>();
-    test<contiguous_iterator<const int*>, output_iterator<int*>>();
+    test<contiguous_iterator<const int*>, cpp17_output_iterator<int*>>();
     test<contiguous_iterator<const int*>, forward_iterator<int*>>();
     test<contiguous_iterator<const int*>, bidirectional_iterator<int*>>();
     test<contiguous_iterator<const int*>, random_access_iterator<int*>>();
@@ -138,7 +138,7 @@
     test1<bidirectional_iterator<std::unique_ptr<int>*>, contiguous_iterator<std::unique_ptr<int>*>>();
     test1<random_access_iterator<std::unique_ptr<int>*>, contiguous_iterator<std::unique_ptr<int>*>>();
     test1<std::unique_ptr<int>*, contiguous_iterator<std::unique_ptr<int>*>>();
-    test1<contiguous_iterator<std::unique_ptr<int>*>, output_iterator<std::unique_ptr<int>*>>();
+    test1<contiguous_iterator<std::unique_ptr<int>*>, cpp17_output_iterator<std::unique_ptr<int>*>>();
     test1<contiguous_iterator<std::unique_ptr<int>*>, forward_iterator<std::unique_ptr<int>*>>();
     test1<contiguous_iterator<std::unique_ptr<int>*>, bidirectional_iterator<std::unique_ptr<int>*>>();
     test1<contiguous_iterator<std::unique_ptr<int>*>, random_access_iterator<std::unique_ptr<int>*>>();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
@@ -49,10 +49,10 @@
         const int ia[] = {1, 2, 3, 4, 6, 8, 5, 7};
         int r1[10] = {0};
         int r2[10] = {0};
-        typedef std::pair<output_iterator<int*>,  int*> P;
+        typedef std::pair<cpp17_output_iterator<int*>,  int*> P;
         P p = std::partition_copy(cpp17_input_iterator<const int*>(std::begin(ia)),
                                   cpp17_input_iterator<const int*>(std::end(ia)),
-                                  output_iterator<int*>(r1), r2, is_odd());
+                                  cpp17_output_iterator<int*>(r1), r2, is_odd());
         assert(p.first.base() == r1 + 4);
         assert(r1[0] == 1);
         assert(r1[1] == 3);
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp
@@ -36,7 +36,7 @@
   // expected-error-re@*:* {{static_assert failed{{( due to requirement '.*')?}} "SampleIterator must meet the requirements of RandomAccessIterator"}}
   // expected-error@*:* 2 {{does not provide a subscript operator}}
   // expected-error@*:* {{invalid operands}}
-  test<cpp17_input_iterator<int *>, output_iterator<int *> >();
+  test<cpp17_input_iterator<int *>, cpp17_output_iterator<int *> >();
 
   return 0;
 }
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
@@ -138,23 +138,23 @@
 
 int main(int, char**) {
   test<cpp17_input_iterator, int, random_access_iterator, int>();
-  test<forward_iterator, int, output_iterator, int>();
+  test<forward_iterator, int, cpp17_output_iterator, int>();
   test<forward_iterator, int, random_access_iterator, int>();
 
   test<cpp17_input_iterator, int, random_access_iterator, double>();
-  test<forward_iterator, int, output_iterator, double>();
+  test<forward_iterator, int, cpp17_output_iterator, double>();
   test<forward_iterator, int, random_access_iterator, double>();
 
   test_empty_population<cpp17_input_iterator, int, random_access_iterator, int>();
-  test_empty_population<forward_iterator, int, output_iterator, int>();
+  test_empty_population<forward_iterator, int, cpp17_output_iterator, int>();
   test_empty_population<forward_iterator, int, random_access_iterator, int>();
 
   test_empty_sample<cpp17_input_iterator, int, random_access_iterator, int>();
-  test_empty_sample<forward_iterator, int, output_iterator, int>();
+  test_empty_sample<forward_iterator, int, cpp17_output_iterator, int>();
   test_empty_sample<forward_iterator, int, random_access_iterator, int>();
 
   test_small_population<cpp17_input_iterator, int, random_access_iterator, int>();
-  test_small_population<forward_iterator, int, output_iterator, int>();
+  test_small_population<forward_iterator, int, cpp17_output_iterator, int>();
   test_small_population<forward_iterator, int, random_access_iterator, int>();
 
   return 0;
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.stable.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.stable.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.stable.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.stable.pass.cpp
@@ -50,7 +50,7 @@
 }
 
 int main(int, char**) {
-  test_stability<forward_iterator<int *>, output_iterator<int *> >(true);
+  test_stability<forward_iterator<int *>, cpp17_output_iterator<int *> >(true);
   test_stability<cpp17_input_iterator<int *>, random_access_iterator<int *> >(false);
 
   return 0;
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
@@ -52,31 +52,31 @@
 
 int main(int, char**)
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
@@ -57,31 +57,31 @@
 
 int main(int, char**)
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
@@ -56,31 +56,31 @@
 
 int main(int, char**)
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
@@ -60,31 +60,31 @@
 
 int main(int, char**)
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
@@ -74,19 +74,19 @@
 
 int main(int, char**)
 {
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
@@ -125,19 +125,19 @@
 }
 
 TEST_CONSTEXPR_CXX20 bool all_tests() {
-  test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+  test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
   test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
   test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
   test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
   test<bidirectional_iterator<const int*>, int*>();
 
-  test<random_access_iterator<const int*>, output_iterator<int*> >();
+  test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
   test<random_access_iterator<const int*>, forward_iterator<int*> >();
   test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
   test<random_access_iterator<const int*>, random_access_iterator<int*> >();
   test<random_access_iterator<const int*>, int*>();
 
-  test<const int*, output_iterator<int*> >();
+  test<const int*, cpp17_output_iterator<int*> >();
   test<const int*, forward_iterator<int*> >();
   test<const int*, bidirectional_iterator<int*> >();
   test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
@@ -58,175 +58,175 @@
 
 int main(int, char**)
 {
-    test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, cpp17_input_iterator<const int*>, int*>();
 
-    test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<const int*>, int*>();
 
-    test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<const int*>, int*>();
 
-    test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<const int*>, int*>();
 
-    test<cpp17_input_iterator<const int*>, const int*, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, const int*, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, const int*, cpp17_input_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, const int*, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, const int*, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, const int*, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, const int*, int*>();
 
-    test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, random_access_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, const int*, output_iterator<int*> >();
+    test<forward_iterator<const int*>, const int*, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, const int*, cpp17_input_iterator<int*> >();
     test<forward_iterator<const int*>, const int*, forward_iterator<int*> >();
     test<forward_iterator<const int*>, const int*, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, const int*, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, const int*, int*>();
 
-    test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, cpp17_input_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, forward_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, const int*, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, const int*, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, const int*, cpp17_input_iterator<int*> >();
     test<bidirectional_iterator<const int*>, const int*, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, const int*, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, const int*, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, const int*, int*>();
 
-    test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, cpp17_input_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, forward_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, const int*, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, const int*, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, const int*, cpp17_input_iterator<int*> >();
     test<random_access_iterator<const int*>, const int*, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, const int*, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, const int*, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, const int*, int*>();
 
-    test<const int*, cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<const int*, cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<const int*, cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<const int*, cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<const int*, cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<const int*, cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<const int*, cpp17_input_iterator<const int*>, int*>();
 
-    test<const int*, forward_iterator<const int*>, output_iterator<int*> >();
+    test<const int*, forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<const int*, forward_iterator<const int*>, forward_iterator<int*> >();
     test<const int*, forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<const int*, forward_iterator<const int*>, random_access_iterator<int*> >();
     test<const int*, forward_iterator<const int*>, int*>();
 
-    test<const int*, bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<const int*, bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<const int*, bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<const int*, bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<const int*, bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<const int*, bidirectional_iterator<const int*>, int*>();
 
-    test<const int*, random_access_iterator<const int*>, output_iterator<int*> >();
+    test<const int*, random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<const int*, random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<const int*, random_access_iterator<const int*>, forward_iterator<int*> >();
     test<const int*, random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<const int*, random_access_iterator<const int*>, int*>();
 
-    test<const int*, const int*, output_iterator<int*> >();
+    test<const int*, const int*, cpp17_output_iterator<int*> >();
     test<const int*, const int*, cpp17_input_iterator<int*> >();
     test<const int*, const int*, forward_iterator<int*> >();
     test<const int*, const int*, bidirectional_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
@@ -59,35 +59,35 @@
 
 int main(int, char**)
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, cpp17_input_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, cpp17_input_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
@@ -107,31 +107,31 @@
 
 int main(int, char**)
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
@@ -135,31 +135,31 @@
 
 int main(int, char**)
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp
@@ -52,7 +52,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp
@@ -53,7 +53,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference.pass.cpp
@@ -52,7 +52,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/set_difference_comp.pass.cpp
@@ -53,7 +53,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection.pass.cpp
@@ -52,7 +52,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_comp.pass.cpp
@@ -53,7 +53,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference.pass.cpp
@@ -52,7 +52,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/set_symmetric_difference_comp.pass.cpp
@@ -53,7 +53,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union.pass.cpp
@@ -52,7 +52,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_comp.pass.cpp
@@ -53,7 +53,7 @@
 template<class T, class Iter1, class Iter2>
 TEST_CONSTEXPR_CXX20 void test3()
 {
-    test4<T, Iter1, Iter2, output_iterator<T*> >();
+    test4<T, Iter1, Iter2, cpp17_output_iterator<T*> >();
     test4<T, Iter1, Iter2, forward_iterator<T*> >();
     test4<T, Iter1, Iter2, bidirectional_iterator<T*> >();
     test4<T, Iter1, Iter2, random_access_iterator<T*> >();
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
@@ -359,7 +359,7 @@
     static_assert(has_append<It>(), "");
   }
   {
-    using It = output_iterator<const char*>;
+    using It = cpp17_output_iterator<const char*>;
     static_assert(!has_append<It>(), "");
 
   }
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
@@ -206,7 +206,7 @@
     static_assert(has_assign<It>(), "");
   }
   {
-    using It = output_iterator<const char*>;
+    using It = cpp17_output_iterator<const char*>;
     static_assert(!std::is_assignable<path, It>::value, "");
     static_assert(!has_assign<It>(), "");
 
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
@@ -327,7 +327,7 @@
     static_assert(has_concat<It>(), "");
   }
   {
-    using It = output_iterator<const char*>;
+    using It = cpp17_output_iterator<const char*>;
     static_assert(!has_concat<It>(), "");
   }
   {
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp
@@ -114,7 +114,7 @@
     static_assert(std::is_constructible<path, It>::value, "");
   }
   {
-    using It = output_iterator<const char*>;
+    using It = cpp17_output_iterator<const char*>;
     static_assert(!std::is_constructible<path, It>::value, "");
 
   }
diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
--- a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
@@ -572,7 +572,7 @@
 static_assert(std::same_as<InputTestIteratorTraits::pointer, int*>);
 static_assert(!has_iterator_concept_v<InputTestIteratorTraits>);
 
-using OutputTestIteratorTraits = std::iterator_traits<output_iterator<int*>>;
+using OutputTestIteratorTraits = std::iterator_traits<cpp17_output_iterator<int*>>;
 static_assert(std::same_as<OutputTestIteratorTraits::iterator_category, std::output_iterator_tag>);
 static_assert(std::same_as<OutputTestIteratorTraits::value_type, void>);
 static_assert(std::same_as<OutputTestIteratorTraits::difference_type, std::ptrdiff_t>);
diff --git a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count.pass.cpp
--- a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.advance/iterator_count.pass.cpp
@@ -55,7 +55,7 @@
     check<true,  random_access_iterator<int*>>(range, n, range+n);
     check<true,  contiguous_iterator<int*>>(   range, n, range+n);
     check<true,  int*>(                        range, n, range+n);
-    check<true,  output_iterator<int*> >(      range, n, range+n);
+    check<true,  cpp17_output_iterator<int*> >(range, n, range+n);
   }
 
   // Check advancing backward
diff --git a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator.pass.cpp
--- a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator.pass.cpp
@@ -36,7 +36,7 @@
     check<bidirectional_iterator<int*>>(range+n, range+n+1);
     check<random_access_iterator<int*>>(range+n, range+n+1);
     check<contiguous_iterator<int*>>(   range+n, range+n+1);
-    check<output_iterator<int*>>(       range+n, range+n+1);
+    check<cpp17_output_iterator<int*>>( range+n, range+n+1);
     check<int*>(                        range+n, range+n+1);
   }
 
diff --git a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator_count.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator_count.pass.cpp
--- a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator_count.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.next/iterator_count.pass.cpp
@@ -38,7 +38,7 @@
     check<random_access_iterator<int*>>(range, n, range+n);
     check<contiguous_iterator<int*>>(   range, n, range+n);
     check<int*>(                        range, n, range+n);
-    check<output_iterator<int*> >(      range, n, range+n);
+    check<cpp17_output_iterator<int*> >(range, n, range+n);
   }
 
   // Check next() backward
diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.output/output_iterator.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.output/output_iterator.compile.pass.cpp
--- a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.output/output_iterator.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.output/output_iterator.compile.pass.cpp
@@ -20,14 +20,14 @@
 struct T { };
 struct DerivedFromT : T { };
 
-static_assert( std::output_iterator<output_iterator<int*>, int>);
-static_assert( std::output_iterator<output_iterator<int*>, short>);
-static_assert( std::output_iterator<output_iterator<int*>, long>);
-static_assert( std::output_iterator<output_iterator<T*>, T>);
-static_assert(!std::output_iterator<output_iterator<T const*>, T>);
-static_assert( std::output_iterator<output_iterator<T*>, T const>);
-static_assert( std::output_iterator<output_iterator<T*>, DerivedFromT>);
-static_assert(!std::output_iterator<output_iterator<DerivedFromT*>, T>);
+static_assert( std::output_iterator<cpp17_output_iterator<int*>, int>);
+static_assert( std::output_iterator<cpp17_output_iterator<int*>, short>);
+static_assert( std::output_iterator<cpp17_output_iterator<int*>, long>);
+static_assert( std::output_iterator<cpp17_output_iterator<T*>, T>);
+static_assert(!std::output_iterator<cpp17_output_iterator<T const*>, T>);
+static_assert( std::output_iterator<cpp17_output_iterator<T*>, T const>);
+static_assert( std::output_iterator<cpp17_output_iterator<T*>, DerivedFromT>);
+static_assert(!std::output_iterator<cpp17_output_iterator<DerivedFromT*>, T>);
 
 // Not satisfied when the iterator is not an input_or_output_iterator
 static_assert(!std::output_iterator<void, int>);
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
@@ -25,7 +25,7 @@
 
 #include "platform_support.h" // locale name macros
 
-typedef std::money_put<char, output_iterator<char*> > Fn;
+typedef std::money_put<char, cpp17_output_iterator<char*> > Fn;
 
 class my_facet
     : public Fn
@@ -36,7 +36,7 @@
 };
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
-typedef std::money_put<wchar_t, output_iterator<wchar_t*> > Fw;
+typedef std::money_put<wchar_t, cpp17_output_iterator<wchar_t*> > Fw;
 
 class my_facetw
     : public Fw
@@ -67,32 +67,28 @@
     {   // zero
         long double v = 0;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0.00");
     }
     {   // negative one
         long double v = -1;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0.01");
     }
     {   // positive
         long double v = 123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1,234,567.89");
     }
     {   // negative
         long double v = -123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1,234,567.89");
     }
@@ -100,8 +96,7 @@
         long double v = 0;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "$0.00");
     }
@@ -109,8 +104,7 @@
         long double v = -1;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-$0.01");
     }
@@ -118,8 +112,7 @@
         long double v = 123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "$1,234,567.89");
     }
@@ -127,8 +120,7 @@
         long double v = -123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-$1,234,567.89");
     }
@@ -138,8 +130,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-$1,234,567.89      ");
         assert(ios.width() == 0);
@@ -150,8 +141,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-$      1,234,567.89");
         assert(ios.width() == 0);
@@ -162,8 +152,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "      -$1,234,567.89");
         assert(ios.width() == 0);
@@ -175,32 +164,28 @@
     {   // zero
         long double v = 0;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0.00");
     }
     {   // negative one
         long double v = -1;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0.01");
     }
     {   // positive
         long double v = 123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1,234,567.89");
     }
     {   // negative
         long double v = -123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1,234,567.89");
     }
@@ -208,8 +193,7 @@
         long double v = 0;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "USD 0.00");
     }
@@ -217,8 +201,7 @@
         long double v = -1;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-USD 0.01");
     }
@@ -226,8 +209,7 @@
         long double v = 123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "USD 1,234,567.89");
     }
@@ -235,8 +217,7 @@
         long double v = -123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-USD 1,234,567.89");
     }
@@ -246,8 +227,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-USD 1,234,567.89   ");
         assert(ios.width() == 0);
@@ -258,8 +238,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-USD    1,234,567.89");
         assert(ios.width() == 0);
@@ -270,8 +249,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "   -USD 1,234,567.89");
         assert(ios.width() == 0);
@@ -286,32 +264,28 @@
     {   // zero
         long double v = 0;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0.00");
     }
     {   // negative one
         long double v = -1;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0.01");
     }
     {   // positive
         long double v = 123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1,234,567.89");
     }
     {   // negative
         long double v = -123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1,234,567.89");
     }
@@ -319,8 +293,7 @@
         long double v = 0;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"$0.00");
     }
@@ -328,8 +301,7 @@
         long double v = -1;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-$0.01");
     }
@@ -337,8 +309,7 @@
         long double v = 123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"$1,234,567.89");
     }
@@ -346,8 +317,7 @@
         long double v = -123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-$1,234,567.89");
     }
@@ -357,8 +327,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-$1,234,567.89      ");
         assert(ios.width() == 0);
@@ -369,8 +338,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-$      1,234,567.89");
         assert(ios.width() == 0);
@@ -381,8 +349,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"      -$1,234,567.89");
         assert(ios.width() == 0);
@@ -394,32 +361,28 @@
     {   // zero
         long double v = 0;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0.00");
     }
     {   // negative one
         long double v = -1;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0.01");
     }
     {   // positive
         long double v = 123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1,234,567.89");
     }
     {   // negative
         long double v = -123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1,234,567.89");
     }
@@ -427,8 +390,7 @@
         long double v = 0;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"USD 0.00");
     }
@@ -436,8 +398,7 @@
         long double v = -1;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-USD 0.01");
     }
@@ -445,8 +406,7 @@
         long double v = 123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"USD 1,234,567.89");
     }
@@ -454,8 +414,7 @@
         long double v = -123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-USD 1,234,567.89");
     }
@@ -465,8 +424,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-USD 1,234,567.89   ");
         assert(ios.width() == 0);
@@ -477,8 +435,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-USD    1,234,567.89");
         assert(ios.width() == 0);
@@ -489,8 +446,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"   -USD 1,234,567.89");
         assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_fr_FR.pass.cpp
@@ -32,7 +32,7 @@
 #include "platform_support.h" // locale name macros
 #include "test_macros.h"
 
-typedef std::money_put<char, output_iterator<char*> > Fn;
+typedef std::money_put<char, cpp17_output_iterator<char*> > Fn;
 
 class my_facet
     : public Fn
@@ -43,7 +43,7 @@
 };
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
-typedef std::money_put<wchar_t, output_iterator<wchar_t*> > Fw;
+typedef std::money_put<wchar_t, cpp17_output_iterator<wchar_t*> > Fw;
 
 class my_facetw
     : public Fw
@@ -103,32 +103,28 @@
     {   // zero
         long double v = 0;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0,00");
     }
     {   // negative one
         long double v = -1;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0,01");
     }
     {   // positive
         long double v = 123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1 234 567,89");
     }
     {   // negative
         long double v = -123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89");
     }
@@ -136,8 +132,7 @@
         long double v = 0;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0,00 \u20ac");
     }
@@ -145,8 +140,7 @@
         long double v = -1;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0,01 \u20ac");
     }
@@ -154,8 +148,7 @@
         long double v = 123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1 234 567,89 \u20ac");
     }
@@ -163,8 +156,7 @@
         long double v = -123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 \u20ac");
     }
@@ -174,8 +166,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 \u20ac   ");
         assert(ios.width() == 0);
@@ -186,8 +177,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89    \u20ac");
         assert(ios.width() == 0);
@@ -198,8 +188,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "   -1 234 567,89 \u20ac");
         assert(ios.width() == 0);
@@ -211,32 +200,28 @@
     {   // zero
         long double v = 0;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0,00");
     }
     {   // negative one
         long double v = -1;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0,01");
     }
     {   // positive
         long double v = 123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1 234 567,89");
     }
     {   // negative
         long double v = -123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89");
     }
@@ -244,8 +229,7 @@
         long double v = 0;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0,00 EUR");
     }
@@ -253,8 +237,7 @@
         long double v = -1;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0,01 EUR");
     }
@@ -262,8 +245,7 @@
         long double v = 123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1 234 567,89 EUR");
     }
@@ -271,8 +253,7 @@
         long double v = -123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 EUR");
     }
@@ -282,8 +263,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 EUR   ");
         assert(ios.width() == 0);
@@ -294,8 +274,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89    EUR");
         assert(ios.width() == 0);
@@ -306,8 +285,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "   -1 234 567,89 EUR");
         assert(ios.width() == 0);
@@ -322,32 +300,28 @@
     {   // zero
         long double v = 0;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0,00");
     }
     {   // negative one
         long double v = -1;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0,01");
     }
     {   // positive
         long double v = 123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"1 234 567,89"));
     }
     {   // negative
         long double v = -123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"-1 234 567,89"));
     }
@@ -355,8 +329,7 @@
         long double v = 0;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0,00 \u20ac");
     }
@@ -364,8 +337,7 @@
         long double v = -1;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0,01 \u20ac");
     }
@@ -373,8 +345,7 @@
         long double v = 123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"1 234 567,89 \u20ac"));
     }
@@ -382,8 +353,7 @@
         long double v = -123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"-1 234 567,89 \u20ac"));
     }
@@ -393,8 +363,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"-1 234 567,89 \u20ac     "));
         assert(ios.width() == 0);
@@ -405,8 +374,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"-1 234 567,89      \u20ac"));
         assert(ios.width() == 0);
@@ -417,8 +385,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"     -1 234 567,89 \u20ac"));
         assert(ios.width() == 0);
@@ -430,32 +397,28 @@
     {   // zero
         long double v = 0;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0,00");
     }
     {   // negative one
         long double v = -1;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0,01");
     }
     {   // positive
         long double v = 123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"1 234 567,89"));
     }
     {   // negative
         long double v = -123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"-1 234 567,89"));
     }
@@ -463,8 +426,7 @@
         long double v = 0;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0,00 EUR");
     }
@@ -472,8 +434,7 @@
         long double v = -1;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0,01 EUR");
     }
@@ -481,8 +442,7 @@
         long double v = 123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"1 234 567,89 EUR"));
     }
@@ -490,8 +450,7 @@
         long double v = -123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"-1 234 567,89 EUR"));
     }
@@ -501,8 +460,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"-1 234 567,89 EUR   "));
         assert(ios.width() == 0);
@@ -513,8 +471,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"-1 234 567,89    EUR"));
         assert(ios.width() == 0);
@@ -525,8 +482,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == convert_thousands_sep(L"   -1 234 567,89 EUR"));
         assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_ru_RU.pass.cpp
@@ -48,7 +48,7 @@
 #   define APPLE_FIXME
 #endif
 
-typedef std::money_put<char, output_iterator<char*> > Fn;
+typedef std::money_put<char, cpp17_output_iterator<char*> > Fn;
 
 class my_facet
     : public Fn
@@ -59,7 +59,7 @@
 };
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
-typedef std::money_put<wchar_t, output_iterator<wchar_t*> > Fw;
+typedef std::money_put<wchar_t, cpp17_output_iterator<wchar_t*> > Fw;
 
 class my_facetw
     : public Fw
@@ -91,32 +91,28 @@
     {   // zero
         long double v = 0;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0,00 ");
     }
     {   // negative one
         long double v = -1;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0,01 ");
     }
     {   // positive
         long double v = 123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1 234 567,89 ");
     }
     {   // negative
         long double v = -123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 ");
     }
@@ -125,8 +121,7 @@
         long double v = 0;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0,00 \xD1\x80\xD1\x83\xD0\xB1"".");
     }
@@ -134,8 +129,7 @@
         long double v = -1;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0,01 \xD1\x80\xD1\x83\xD0\xB1"".");
     }
@@ -143,8 +137,7 @@
         long double v = 123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
     }
@@ -152,8 +145,7 @@
         long double v = -123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
     }
@@ -163,8 +155,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
         assert(ios.width() == 0);
@@ -175,8 +166,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
         assert(ios.width() == 0);
@@ -187,8 +177,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 \xD1\x80\xD1\x83\xD0\xB1"".");
         assert(ios.width() == 0);
@@ -201,32 +190,28 @@
     {   // zero
         long double v = 0;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0,00 ");
     }
     {   // negative one
         long double v = -1;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0,01 ");
     }
     {   // positive
         long double v = 123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1 234 567,89 ");
     }
     {   // negative
         long double v = -123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 ");
     }
@@ -234,8 +219,7 @@
         long double v = 0;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0,00 RUB ");
     }
@@ -243,8 +227,7 @@
         long double v = -1;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0,01 RUB ");
     }
@@ -252,8 +235,7 @@
         long double v = 123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1 234 567,89 RUB ");
     }
@@ -261,8 +243,7 @@
         long double v = -123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 RUB ");
     }
@@ -273,8 +254,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89 RUB   ");
         assert(ios.width() == 0);
@@ -286,8 +266,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-1 234 567,89   RUB ");
         assert(ios.width() == 0);
@@ -298,8 +277,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "  -1 234 567,89 RUB ");
         assert(ios.width() == 0);
@@ -316,32 +294,28 @@
     {   // zero
         long double v = 0;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0,00 ");
     }
     {   // negative one
         long double v = -1;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0,01 ");
     }
     {   // positive
         long double v = 123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1 234 567,89 ");
     }
     {   // negative
         long double v = -123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1 234 567,89 ");
     }
@@ -350,8 +324,7 @@
         long double v = 0;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0,00 \x440\x443\x431"".");
     }
@@ -359,8 +332,7 @@
         long double v = -1;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0,01 \x440\x443\x431"".");
     }
@@ -368,8 +340,7 @@
         long double v = 123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1 234 567,89 \x440\x443\x431"".");
     }
@@ -377,8 +348,7 @@
         long double v = -123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1 234 567,89 \x440\x443\x431"".");
     }
@@ -388,8 +358,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1 234 567,89 \x440\x443\x431"".  ");
         assert(ios.width() == 0);
@@ -400,8 +369,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1 234 567,89   \x440\x443\x431"".");
         assert(ios.width() == 0);
@@ -412,8 +380,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"  -1 234 567,89 \x440\x443\x431"".");
         assert(ios.width() == 0);
@@ -426,32 +393,28 @@
     {   // zero
         long double v = 0;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0,00 ");
     }
     {   // negative one
         long double v = -1;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0,01 ");
     }
     {   // positive
         long double v = 123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1 234 567,89 ");
     }
     {   // negative
         long double v = -123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1 234 567,89 ");
     }
@@ -459,8 +422,7 @@
         long double v = 0;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0,00 RUB ");
     }
@@ -468,8 +430,7 @@
         long double v = -1;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0,01 RUB ");
     }
@@ -477,8 +438,7 @@
         long double v = 123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1 234 567,89 RUB ");
     }
@@ -486,8 +446,7 @@
         long double v = -123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1 234 567,89 RUB ");
     }
@@ -498,8 +457,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1 234 567,89 RUB   ");
         assert(ios.width() == 0);
@@ -511,8 +469,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1 234 567,89   RUB ");
         assert(ios.width() == 0);
@@ -523,8 +480,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"  -1 234 567,89 RUB ");
         assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp
@@ -33,7 +33,7 @@
 
 #include "platform_support.h" // locale name macros
 
-typedef std::money_put<char, output_iterator<char*> > Fn;
+typedef std::money_put<char, cpp17_output_iterator<char*> > Fn;
 
 class my_facet
     : public Fn
@@ -44,7 +44,7 @@
 };
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
-typedef std::money_put<wchar_t, output_iterator<wchar_t*> > Fw;
+typedef std::money_put<wchar_t, cpp17_output_iterator<wchar_t*> > Fw;
 
 class my_facetw
     : public Fw
@@ -75,32 +75,28 @@
     {   // zero
         long double v = 0;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0.00");
     }
     {   // negative one
         long double v = -1;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0.01");
     }
     {   // positive
         long double v = 123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1,234,567.89");
     }
     {   // negative
         long double v = -123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1,234,567.89");
     }
@@ -108,8 +104,7 @@
         long double v = 0;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "\xEF\xBF\xA5""0.00");
     }
@@ -117,8 +112,7 @@
         long double v = -1;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "\xEF\xBF\xA5""-0.01");
     }
@@ -126,8 +120,7 @@
         long double v = 123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "\xEF\xBF\xA5""1,234,567.89");
     }
@@ -135,8 +128,7 @@
         long double v = -123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "\xEF\xBF\xA5""-1,234,567.89");
     }
@@ -146,8 +138,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "\xEF\xBF\xA5""-1,234,567.89    ");
         assert(ios.width() == 0);
@@ -158,8 +149,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "\xEF\xBF\xA5""-    1,234,567.89");
         assert(ios.width() == 0);
@@ -170,8 +160,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "    \xEF\xBF\xA5""-1,234,567.89");
         assert(ios.width() == 0);
@@ -183,32 +172,28 @@
     {   // zero
         long double v = 0;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0.00");
     }
     {   // negative one
         long double v = -1;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0.01");
     }
     {   // positive
         long double v = 123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1,234,567.89");
     }
     {   // negative
         long double v = -123456789;
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1,234,567.89");
     }
@@ -216,8 +201,7 @@
         long double v = 0;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "CNY 0.00");
     }
@@ -225,8 +209,7 @@
         long double v = -1;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "CNY -0.01");
     }
@@ -234,8 +217,7 @@
         long double v = 123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "CNY 1,234,567.89");
     }
@@ -243,8 +225,7 @@
         long double v = -123456789;
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "CNY -1,234,567.89");
     }
@@ -254,8 +235,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "CNY -1,234,567.89   ");
         assert(ios.width() == 0);
@@ -266,8 +246,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "CNY -   1,234,567.89");
         assert(ios.width() == 0);
@@ -278,8 +257,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "   CNY -1,234,567.89");
         assert(ios.width() == 0);
@@ -294,32 +272,28 @@
     {   // zero
         long double v = 0;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0.00");
     }
     {   // negative one
         long double v = -1;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0.01");
     }
     {   // positive
         long double v = 123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1,234,567.89");
     }
     {   // negative
         long double v = -123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1,234,567.89");
     }
@@ -327,8 +301,7 @@
         long double v = 0;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"\xFFE5""0.00");
     }
@@ -336,8 +309,7 @@
         long double v = -1;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"\xFFE5""-0.01");
     }
@@ -345,8 +317,7 @@
         long double v = 123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"\xFFE5""1,234,567.89");
     }
@@ -354,8 +325,7 @@
         long double v = -123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"\xFFE5""-1,234,567.89");
     }
@@ -365,8 +335,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"\xFFE5""-1,234,567.89      ");
         assert(ios.width() == 0);
@@ -377,8 +346,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"\xFFE5""-      1,234,567.89");
         assert(ios.width() == 0);
@@ -389,8 +357,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"      \xFFE5""-1,234,567.89");
         assert(ios.width() == 0);
@@ -402,32 +369,28 @@
     {   // zero
         long double v = 0;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0.00");
     }
     {   // negative one
         long double v = -1;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0.01");
     }
     {   // positive
         long double v = 123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1,234,567.89");
     }
     {   // negative
         long double v = -123456789;
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1,234,567.89");
     }
@@ -435,8 +398,7 @@
         long double v = 0;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"CNY 0.00");
     }
@@ -444,8 +406,7 @@
         long double v = -1;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"CNY -0.01");
     }
@@ -453,8 +414,7 @@
         long double v = 123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"CNY 1,234,567.89");
     }
@@ -462,8 +422,7 @@
         long double v = -123456789;
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"CNY -1,234,567.89");
     }
@@ -473,8 +432,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"CNY -1,234,567.89   ");
         assert(ios.width() == 0);
@@ -485,8 +443,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"CNY -   1,234,567.89");
         assert(ios.width() == 0);
@@ -497,8 +454,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"   CNY -1,234,567.89");
         assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
@@ -26,7 +26,7 @@
 
 #include "platform_support.h" // locale name macros
 
-typedef std::money_put<char, output_iterator<char*> > Fn;
+typedef std::money_put<char, cpp17_output_iterator<char*> > Fn;
 
 class my_facet
     : public Fn
@@ -37,7 +37,7 @@
 };
 
 #ifndef TEST_HAS_NO_WIDE_CHARACTERS
-typedef std::money_put<wchar_t, output_iterator<wchar_t*> > Fw;
+typedef std::money_put<wchar_t, cpp17_output_iterator<wchar_t*> > Fw;
 
 class my_facetw
     : public Fw
@@ -68,32 +68,28 @@
     {   // zero
         std::string v = "0";
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0.00");
     }
     {   // negative one
         std::string v = "-1";
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0.01");
     }
     {   // positive
         std::string v = "123456789";
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1,234,567.89");
     }
     {   // negative
         std::string v = "-123456789";
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1,234,567.89");
     }
@@ -101,8 +97,7 @@
         std::string v = "0";
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "$0.00");
     }
@@ -110,8 +105,7 @@
         std::string v = "-1";
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-$0.01");
     }
@@ -119,8 +113,7 @@
         std::string v = "123456789";
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "$1,234,567.89");
     }
@@ -128,8 +121,7 @@
         std::string v = "-123456789";
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-$1,234,567.89");
     }
@@ -139,8 +131,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-$1,234,567.89      ");
         assert(ios.width() == 0);
@@ -151,8 +142,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-$      1,234,567.89");
         assert(ios.width() == 0);
@@ -163,8 +153,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), false, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "      -$1,234,567.89");
         assert(ios.width() == 0);
@@ -176,32 +165,28 @@
     {   // zero
         std::string v = "0";
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0.00");
     }
     {   // negative one
         std::string v = "-1";
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-0.01");
     }
     {   // positive
         std::string v = "123456789";
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1,234,567.89");
     }
     {   // negative
         std::string v = "-123456789";
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1,234,567.89");
     }
@@ -209,8 +194,7 @@
         std::string v = "0";
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "USD 0.00");
     }
@@ -218,8 +202,7 @@
         std::string v = "-1";
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-USD 0.01");
     }
@@ -227,8 +210,7 @@
         std::string v = "123456789";
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "USD 1,234,567.89");
     }
@@ -236,8 +218,7 @@
         std::string v = "-123456789";
         showbase(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-USD 1,234,567.89");
     }
@@ -247,8 +228,7 @@
         ios.width(20);
         left(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-USD 1,234,567.89   ");
         assert(ios.width() == 0);
@@ -259,8 +239,7 @@
         ios.width(20);
         internal(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "-USD    1,234,567.89");
         assert(ios.width() == 0);
@@ -271,8 +250,7 @@
         ios.width(20);
         right(ios);
         char str[100];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), true, ios, ' ', v);
         std::string ex(str, iter.base());
         assert(ex == "   -USD 1,234,567.89");
         assert(ios.width() == 0);
@@ -287,32 +265,28 @@
     {   // zero
         std::wstring v = L"0";
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0.00");
     }
     {   // negative one
         std::wstring v = L"-1";
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0.01");
     }
     {   // positive
         std::wstring v = L"123456789";
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1,234,567.89");
     }
     {   // negative
         std::wstring v = L"-123456789";
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1,234,567.89");
     }
@@ -320,8 +294,7 @@
         std::wstring v = L"0";
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"$0.00");
     }
@@ -329,8 +302,7 @@
         std::wstring v = L"-1";
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-$0.01");
     }
@@ -338,8 +310,7 @@
         std::wstring v = L"123456789";
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"$1,234,567.89");
     }
@@ -347,8 +318,7 @@
         std::wstring v = L"-123456789";
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-$1,234,567.89");
     }
@@ -358,8 +328,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-$1,234,567.89      ");
         assert(ios.width() == 0);
@@ -370,8 +339,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-$      1,234,567.89");
         assert(ios.width() == 0);
@@ -382,8 +350,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            false, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), false, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"      -$1,234,567.89");
         assert(ios.width() == 0);
@@ -395,32 +362,28 @@
     {   // zero
         std::wstring v = L"0";
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"0.00");
     }
     {   // negative one
         std::wstring v = L"-1";
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-0.01");
     }
     {   // positive
         std::wstring v = L"123456789";
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"1,234,567.89");
     }
     {   // negative
         std::wstring v = L"-123456789";
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-1,234,567.89");
     }
@@ -428,8 +391,7 @@
         std::wstring v = L"0";
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"USD 0.00");
     }
@@ -437,8 +399,7 @@
         std::wstring v = L"-1";
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-USD 0.01");
     }
@@ -446,8 +407,7 @@
         std::wstring v = L"123456789";
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"USD 1,234,567.89");
     }
@@ -455,8 +415,7 @@
         std::wstring v = L"-123456789";
         showbase(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, '*', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, '*', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-USD 1,234,567.89");
     }
@@ -466,8 +425,7 @@
         ios.width(20);
         left(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-USD 1,234,567.89   ");
         assert(ios.width() == 0);
@@ -478,8 +436,7 @@
         ios.width(20);
         internal(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"-USD    1,234,567.89");
         assert(ios.width() == 0);
@@ -490,8 +447,7 @@
         ios.width(20);
         right(ios);
         wchar_t str[100];
-        output_iterator<wchar_t*> iter = f.put(output_iterator<wchar_t*>(str),
-                                            true, ios, ' ', v);
+        cpp17_output_iterator<wchar_t*> iter = f.put(cpp17_output_iterator<wchar_t*>(str), true, ios, ' ', v);
         std::wstring ex(str, iter.base());
         assert(ex == L"   -USD 1,234,567.89");
         assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_bool.pass.cpp
@@ -19,7 +19,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::num_put<char, output_iterator<char*> > F;
+typedef std::num_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -48,14 +48,14 @@
         {
             bool v = false;
             char str[50];
-            output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+            cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
             std::string ex(str, iter.base());
             assert(ex == "0");
         }
         {
             bool v = true;
             char str[50];
-            output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+            cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
             std::string ex(str, iter.base());
             assert(ex == "1");
         }
@@ -66,14 +66,14 @@
         {
             bool v = false;
             char str[50];
-            output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+            cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
             std::string ex(str, iter.base());
             assert(ex == "false");
         }
         {
             bool v = true;
             char str[50];
-            output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+            cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
             std::string ex(str, iter.base());
             assert(ex == "true");
         }
@@ -85,14 +85,14 @@
         {
             bool v = false;
             char str[50];
-            output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+            cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
             std::string ex(str, iter.base());
             assert(ex == "no");
         }
         {
             bool v = true;
             char str[50];
-            output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+            cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
             std::string ex(str, iter.base());
             assert(ex == "yes");
         }
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_double.pass.cpp
@@ -23,7 +23,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::num_put<char, output_iterator<char*> > F;
+typedef std::num_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -48,7 +48,7 @@
 void test1()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -69,7 +69,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -77,7 +77,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -85,7 +85,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -93,7 +93,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -103,7 +103,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -111,7 +111,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -119,7 +119,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -127,7 +127,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -140,7 +140,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -148,7 +148,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -156,7 +156,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -164,7 +164,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -174,7 +174,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -182,7 +182,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -190,7 +190,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -198,7 +198,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -214,7 +214,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -222,7 +222,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -230,7 +230,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -238,7 +238,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -248,7 +248,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -256,7 +256,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -264,7 +264,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -272,7 +272,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -285,7 +285,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -293,7 +293,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -301,7 +301,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -309,7 +309,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -319,7 +319,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -327,7 +327,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -335,7 +335,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -343,7 +343,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -362,7 +362,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -370,7 +370,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -378,7 +378,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -386,7 +386,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -396,7 +396,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -404,7 +404,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -412,7 +412,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -420,7 +420,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -433,7 +433,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -441,7 +441,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -449,7 +449,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -457,7 +457,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -467,7 +467,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -475,7 +475,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -483,7 +483,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -491,7 +491,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -507,7 +507,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -515,7 +515,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -523,7 +523,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -531,7 +531,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -541,7 +541,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -549,7 +549,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -557,7 +557,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -565,7 +565,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -578,7 +578,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -586,7 +586,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -594,7 +594,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -602,7 +602,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -612,7 +612,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -620,7 +620,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -628,7 +628,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -636,7 +636,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -658,7 +658,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -666,7 +666,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -674,7 +674,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -682,7 +682,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -692,7 +692,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -700,7 +700,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -708,7 +708,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -716,7 +716,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -729,7 +729,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -737,7 +737,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -745,7 +745,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -753,7 +753,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -763,7 +763,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -771,7 +771,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -779,7 +779,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -787,7 +787,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -803,7 +803,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -811,7 +811,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -819,7 +819,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -827,7 +827,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -837,7 +837,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -845,7 +845,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -853,7 +853,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -861,7 +861,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -874,7 +874,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -882,7 +882,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -890,7 +890,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -898,7 +898,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -908,7 +908,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -916,7 +916,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -924,7 +924,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -932,7 +932,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -951,7 +951,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -959,7 +959,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -967,7 +967,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -975,7 +975,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -985,7 +985,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -993,7 +993,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1001,7 +1001,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1009,7 +1009,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1022,7 +1022,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -1030,7 +1030,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -1038,7 +1038,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -1046,7 +1046,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -1056,7 +1056,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -1064,7 +1064,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -1072,7 +1072,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -1080,7 +1080,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -1096,7 +1096,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1104,7 +1104,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1112,7 +1112,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1120,7 +1120,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1130,7 +1130,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1138,7 +1138,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1146,7 +1146,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1154,7 +1154,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1167,7 +1167,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -1175,7 +1175,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -1183,7 +1183,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -1191,7 +1191,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -1201,7 +1201,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -1209,7 +1209,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -1217,7 +1217,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -1225,7 +1225,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -1247,7 +1247,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1255,7 +1255,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1263,7 +1263,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1271,7 +1271,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1281,7 +1281,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1289,7 +1289,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1297,7 +1297,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1305,7 +1305,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1318,7 +1318,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000");
                                     assert(ios.width() == 0);
@@ -1326,7 +1326,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000******************");
                                     assert(ios.width() == 0);
@@ -1334,7 +1334,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0.00000");
                                     assert(ios.width() == 0);
@@ -1342,7 +1342,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0.00000");
                                     assert(ios.width() == 0);
@@ -1352,7 +1352,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000");
                                     assert(ios.width() == 0);
@@ -1360,7 +1360,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000******************");
                                     assert(ios.width() == 0);
@@ -1368,7 +1368,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0;00000");
                                     assert(ios.width() == 0);
@@ -1376,7 +1376,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0;00000");
                                     assert(ios.width() == 0);
@@ -1392,7 +1392,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1400,7 +1400,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1408,7 +1408,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1416,7 +1416,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1426,7 +1426,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1434,7 +1434,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1442,7 +1442,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1450,7 +1450,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1463,7 +1463,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000");
                                     assert(ios.width() == 0);
@@ -1471,7 +1471,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000*****************");
                                     assert(ios.width() == 0);
@@ -1479,7 +1479,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+0.00000");
                                     assert(ios.width() == 0);
@@ -1487,7 +1487,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************0.00000");
                                     assert(ios.width() == 0);
@@ -1497,7 +1497,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000");
                                     assert(ios.width() == 0);
@@ -1505,7 +1505,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000*****************");
                                     assert(ios.width() == 0);
@@ -1513,7 +1513,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+0;00000");
                                     assert(ios.width() == 0);
@@ -1521,7 +1521,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************0;00000");
                                     assert(ios.width() == 0);
@@ -1540,7 +1540,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1548,7 +1548,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1556,7 +1556,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1564,7 +1564,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1574,7 +1574,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1582,7 +1582,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1590,7 +1590,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1598,7 +1598,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1611,7 +1611,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000");
                                     assert(ios.width() == 0);
@@ -1619,7 +1619,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000******************");
                                     assert(ios.width() == 0);
@@ -1627,7 +1627,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0.00000");
                                     assert(ios.width() == 0);
@@ -1635,7 +1635,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0.00000");
                                     assert(ios.width() == 0);
@@ -1645,7 +1645,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000");
                                     assert(ios.width() == 0);
@@ -1653,7 +1653,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000******************");
                                     assert(ios.width() == 0);
@@ -1661,7 +1661,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0;00000");
                                     assert(ios.width() == 0);
@@ -1669,7 +1669,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0;00000");
                                     assert(ios.width() == 0);
@@ -1685,7 +1685,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1693,7 +1693,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1701,7 +1701,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1709,7 +1709,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1719,7 +1719,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1727,7 +1727,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1735,7 +1735,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1743,7 +1743,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1756,7 +1756,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000");
                                     assert(ios.width() == 0);
@@ -1764,7 +1764,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000*****************");
                                     assert(ios.width() == 0);
@@ -1772,7 +1772,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+0.00000");
                                     assert(ios.width() == 0);
@@ -1780,7 +1780,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************0.00000");
                                     assert(ios.width() == 0);
@@ -1790,7 +1790,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000");
                                     assert(ios.width() == 0);
@@ -1798,7 +1798,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000*****************");
                                     assert(ios.width() == 0);
@@ -1806,7 +1806,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+0;00000");
                                     assert(ios.width() == 0);
@@ -1814,7 +1814,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************0;00000");
                                     assert(ios.width() == 0);
@@ -1836,7 +1836,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1844,7 +1844,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1852,7 +1852,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1860,7 +1860,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1870,7 +1870,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1878,7 +1878,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1886,7 +1886,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1894,7 +1894,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1907,7 +1907,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000");
                                     assert(ios.width() == 0);
@@ -1915,7 +1915,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000********");
                                     assert(ios.width() == 0);
@@ -1923,7 +1923,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0.000000000000000");
                                     assert(ios.width() == 0);
@@ -1931,7 +1931,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0.000000000000000");
                                     assert(ios.width() == 0);
@@ -1941,7 +1941,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000");
                                     assert(ios.width() == 0);
@@ -1949,7 +1949,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000********");
                                     assert(ios.width() == 0);
@@ -1957,7 +1957,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0;000000000000000");
                                     assert(ios.width() == 0);
@@ -1965,7 +1965,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0;000000000000000");
                                     assert(ios.width() == 0);
@@ -1981,7 +1981,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1989,7 +1989,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1997,7 +1997,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2005,7 +2005,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2015,7 +2015,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2023,7 +2023,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2031,7 +2031,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2039,7 +2039,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2052,7 +2052,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2060,7 +2060,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000*******");
                                     assert(ios.width() == 0);
@@ -2068,7 +2068,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2076,7 +2076,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2086,7 +2086,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2094,7 +2094,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000*******");
                                     assert(ios.width() == 0);
@@ -2102,7 +2102,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2110,7 +2110,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2129,7 +2129,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2137,7 +2137,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2145,7 +2145,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2153,7 +2153,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2163,7 +2163,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2171,7 +2171,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2179,7 +2179,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2187,7 +2187,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2200,7 +2200,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2208,7 +2208,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000********");
                                     assert(ios.width() == 0);
@@ -2216,7 +2216,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2224,7 +2224,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2234,7 +2234,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2242,7 +2242,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000********");
                                     assert(ios.width() == 0);
@@ -2250,7 +2250,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2258,7 +2258,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2274,7 +2274,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2282,7 +2282,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2290,7 +2290,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2298,7 +2298,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2308,7 +2308,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2316,7 +2316,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2324,7 +2324,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2332,7 +2332,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2345,7 +2345,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2353,7 +2353,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000*******");
                                     assert(ios.width() == 0);
@@ -2361,7 +2361,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2369,7 +2369,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2379,7 +2379,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2387,7 +2387,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000*******");
                                     assert(ios.width() == 0);
@@ -2395,7 +2395,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2403,7 +2403,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2425,7 +2425,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2433,7 +2433,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2441,7 +2441,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2449,7 +2449,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2459,7 +2459,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2467,7 +2467,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2475,7 +2475,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2483,7 +2483,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2496,7 +2496,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2504,7 +2504,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2512,7 +2512,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2520,7 +2520,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2530,7 +2530,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2538,7 +2538,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2546,7 +2546,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2554,7 +2554,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2570,7 +2570,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2578,7 +2578,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2586,7 +2586,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2594,7 +2594,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2604,7 +2604,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2612,7 +2612,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2620,7 +2620,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2628,7 +2628,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2641,7 +2641,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2649,7 +2649,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2657,7 +2657,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2665,7 +2665,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2675,7 +2675,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2683,7 +2683,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2691,7 +2691,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2699,7 +2699,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2718,7 +2718,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2726,7 +2726,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2734,7 +2734,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2742,7 +2742,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2752,7 +2752,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2760,7 +2760,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2768,7 +2768,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2776,7 +2776,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2789,7 +2789,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2797,7 +2797,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2805,7 +2805,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2813,7 +2813,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2823,7 +2823,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2831,7 +2831,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2839,7 +2839,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2847,7 +2847,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2863,7 +2863,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2871,7 +2871,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2879,7 +2879,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2887,7 +2887,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2897,7 +2897,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2905,7 +2905,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2913,7 +2913,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2921,7 +2921,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2934,7 +2934,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2942,7 +2942,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2950,7 +2950,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2958,7 +2958,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2968,7 +2968,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2976,7 +2976,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2984,7 +2984,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2992,7 +2992,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -3009,7 +3009,7 @@
 void test2()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -3030,7 +3030,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -3038,7 +3038,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -3046,7 +3046,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -3054,7 +3054,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -3064,7 +3064,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -3072,7 +3072,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -3080,7 +3080,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -3088,7 +3088,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -3101,7 +3101,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09");
                                     assert(ios.width() == 0);
@@ -3109,7 +3109,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09*******************");
                                     assert(ios.width() == 0);
@@ -3117,7 +3117,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -3125,7 +3125,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -3135,7 +3135,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09");
                                     assert(ios.width() == 0);
@@ -3143,7 +3143,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09*******************");
                                     assert(ios.width() == 0);
@@ -3151,7 +3151,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -3159,7 +3159,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -3175,7 +3175,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -3183,7 +3183,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -3191,7 +3191,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -3199,7 +3199,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -3209,7 +3209,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -3217,7 +3217,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -3225,7 +3225,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -3233,7 +3233,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -3246,7 +3246,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09");
                                     assert(ios.width() == 0);
@@ -3254,7 +3254,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09******************");
                                     assert(ios.width() == 0);
@@ -3262,7 +3262,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.e+09");
                                     assert(ios.width() == 0);
@@ -3270,7 +3270,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.e+09");
                                     assert(ios.width() == 0);
@@ -3280,7 +3280,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09");
                                     assert(ios.width() == 0);
@@ -3288,7 +3288,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09******************");
                                     assert(ios.width() == 0);
@@ -3296,7 +3296,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;e+09");
                                     assert(ios.width() == 0);
@@ -3304,7 +3304,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;e+09");
                                     assert(ios.width() == 0);
@@ -3323,7 +3323,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -3331,7 +3331,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -3339,7 +3339,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -3347,7 +3347,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -3357,7 +3357,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -3365,7 +3365,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -3373,7 +3373,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -3381,7 +3381,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -3394,7 +3394,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09");
                                     assert(ios.width() == 0);
@@ -3402,7 +3402,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09*******************");
                                     assert(ios.width() == 0);
@@ -3410,7 +3410,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -3418,7 +3418,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -3428,7 +3428,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09");
                                     assert(ios.width() == 0);
@@ -3436,7 +3436,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09*******************");
                                     assert(ios.width() == 0);
@@ -3444,7 +3444,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -3452,7 +3452,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -3468,7 +3468,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -3476,7 +3476,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -3484,7 +3484,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -3492,7 +3492,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -3502,7 +3502,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -3510,7 +3510,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -3518,7 +3518,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -3526,7 +3526,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -3539,7 +3539,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09");
                                     assert(ios.width() == 0);
@@ -3547,7 +3547,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09******************");
                                     assert(ios.width() == 0);
@@ -3555,7 +3555,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.E+09");
                                     assert(ios.width() == 0);
@@ -3563,7 +3563,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.E+09");
                                     assert(ios.width() == 0);
@@ -3573,7 +3573,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09");
                                     assert(ios.width() == 0);
@@ -3581,7 +3581,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09******************");
                                     assert(ios.width() == 0);
@@ -3589,7 +3589,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;E+09");
                                     assert(ios.width() == 0);
@@ -3597,7 +3597,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;E+09");
                                     assert(ios.width() == 0);
@@ -3619,7 +3619,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -3627,7 +3627,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -3635,7 +3635,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -3643,7 +3643,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -3653,7 +3653,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -3661,7 +3661,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -3669,7 +3669,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -3677,7 +3677,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -3690,7 +3690,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09");
                                     assert(ios.width() == 0);
@@ -3698,7 +3698,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09*******************");
                                     assert(ios.width() == 0);
@@ -3706,7 +3706,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -3714,7 +3714,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -3724,7 +3724,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09");
                                     assert(ios.width() == 0);
@@ -3732,7 +3732,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09*******************");
                                     assert(ios.width() == 0);
@@ -3740,7 +3740,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -3748,7 +3748,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -3764,7 +3764,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -3772,7 +3772,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -3780,7 +3780,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -3788,7 +3788,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -3798,7 +3798,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -3806,7 +3806,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -3814,7 +3814,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -3822,7 +3822,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -3835,7 +3835,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09");
                                     assert(ios.width() == 0);
@@ -3843,7 +3843,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09******************");
                                     assert(ios.width() == 0);
@@ -3851,7 +3851,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.e+09");
                                     assert(ios.width() == 0);
@@ -3859,7 +3859,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.e+09");
                                     assert(ios.width() == 0);
@@ -3869,7 +3869,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09");
                                     assert(ios.width() == 0);
@@ -3877,7 +3877,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09******************");
                                     assert(ios.width() == 0);
@@ -3885,7 +3885,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;e+09");
                                     assert(ios.width() == 0);
@@ -3893,7 +3893,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;e+09");
                                     assert(ios.width() == 0);
@@ -3912,7 +3912,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -3920,7 +3920,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -3928,7 +3928,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -3936,7 +3936,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -3946,7 +3946,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -3954,7 +3954,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -3962,7 +3962,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -3970,7 +3970,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -3983,7 +3983,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09");
                                     assert(ios.width() == 0);
@@ -3991,7 +3991,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09*******************");
                                     assert(ios.width() == 0);
@@ -3999,7 +3999,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -4007,7 +4007,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -4017,7 +4017,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09");
                                     assert(ios.width() == 0);
@@ -4025,7 +4025,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09*******************");
                                     assert(ios.width() == 0);
@@ -4033,7 +4033,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -4041,7 +4041,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -4057,7 +4057,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -4065,7 +4065,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -4073,7 +4073,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -4081,7 +4081,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -4091,7 +4091,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -4099,7 +4099,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -4107,7 +4107,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -4115,7 +4115,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -4128,7 +4128,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09");
                                     assert(ios.width() == 0);
@@ -4136,7 +4136,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09******************");
                                     assert(ios.width() == 0);
@@ -4144,7 +4144,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.E+09");
                                     assert(ios.width() == 0);
@@ -4152,7 +4152,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.E+09");
                                     assert(ios.width() == 0);
@@ -4162,7 +4162,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09");
                                     assert(ios.width() == 0);
@@ -4170,7 +4170,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09******************");
                                     assert(ios.width() == 0);
@@ -4178,7 +4178,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;E+09");
                                     assert(ios.width() == 0);
@@ -4186,7 +4186,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;E+09");
                                     assert(ios.width() == 0);
@@ -4208,7 +4208,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4216,7 +4216,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457e+09**************");
                                     assert(ios.width() == 0);
@@ -4224,7 +4224,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4232,7 +4232,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4242,7 +4242,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4250,7 +4250,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457e+09**************");
                                     assert(ios.width() == 0);
@@ -4258,7 +4258,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4266,7 +4266,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4279,7 +4279,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4287,7 +4287,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457e+09**************");
                                     assert(ios.width() == 0);
@@ -4295,7 +4295,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4303,7 +4303,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4313,7 +4313,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4321,7 +4321,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457e+09**************");
                                     assert(ios.width() == 0);
@@ -4329,7 +4329,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4337,7 +4337,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4353,7 +4353,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4361,7 +4361,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457e+09*************");
                                     assert(ios.width() == 0);
@@ -4369,7 +4369,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4377,7 +4377,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4387,7 +4387,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4395,7 +4395,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457e+09*************");
                                     assert(ios.width() == 0);
@@ -4403,7 +4403,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4411,7 +4411,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4424,7 +4424,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4432,7 +4432,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457e+09*************");
                                     assert(ios.width() == 0);
@@ -4440,7 +4440,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4448,7 +4448,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -4458,7 +4458,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4466,7 +4466,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457e+09*************");
                                     assert(ios.width() == 0);
@@ -4474,7 +4474,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4482,7 +4482,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -4501,7 +4501,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4509,7 +4509,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457E+09**************");
                                     assert(ios.width() == 0);
@@ -4517,7 +4517,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4525,7 +4525,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4535,7 +4535,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4543,7 +4543,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457E+09**************");
                                     assert(ios.width() == 0);
@@ -4551,7 +4551,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4559,7 +4559,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4572,7 +4572,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4580,7 +4580,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457E+09**************");
                                     assert(ios.width() == 0);
@@ -4588,7 +4588,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4596,7 +4596,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4606,7 +4606,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4614,7 +4614,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457E+09**************");
                                     assert(ios.width() == 0);
@@ -4622,7 +4622,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4630,7 +4630,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4646,7 +4646,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4654,7 +4654,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457E+09*************");
                                     assert(ios.width() == 0);
@@ -4662,7 +4662,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4670,7 +4670,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4680,7 +4680,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4688,7 +4688,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457E+09*************");
                                     assert(ios.width() == 0);
@@ -4696,7 +4696,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4704,7 +4704,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4717,7 +4717,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4725,7 +4725,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457E+09*************");
                                     assert(ios.width() == 0);
@@ -4733,7 +4733,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4741,7 +4741,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -4751,7 +4751,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4759,7 +4759,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457E+09*************");
                                     assert(ios.width() == 0);
@@ -4767,7 +4767,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4775,7 +4775,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -4797,7 +4797,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125");
                                     assert(ios.width() == 0);
@@ -4805,7 +4805,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125***********");
                                     assert(ios.width() == 0);
@@ -4813,7 +4813,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -4821,7 +4821,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -4831,7 +4831,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -4839,7 +4839,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125*******");
                                     assert(ios.width() == 0);
@@ -4847,7 +4847,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -4855,7 +4855,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -4868,7 +4868,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -4876,7 +4876,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -4884,7 +4884,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -4892,7 +4892,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -4902,7 +4902,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -4910,7 +4910,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -4918,7 +4918,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -4926,7 +4926,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -4942,7 +4942,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125");
                                     assert(ios.width() == 0);
@@ -4950,7 +4950,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125**********");
                                     assert(ios.width() == 0);
@@ -4958,7 +4958,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1234567890.125");
                                     assert(ios.width() == 0);
@@ -4966,7 +4966,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1234567890.125");
                                     assert(ios.width() == 0);
@@ -4976,7 +4976,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -4984,7 +4984,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125******");
                                     assert(ios.width() == 0);
@@ -4992,7 +4992,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5000,7 +5000,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5013,7 +5013,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -5021,7 +5021,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -5029,7 +5029,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -5037,7 +5037,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -5047,7 +5047,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -5055,7 +5055,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -5063,7 +5063,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -5071,7 +5071,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -5090,7 +5090,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125");
                                     assert(ios.width() == 0);
@@ -5098,7 +5098,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125***********");
                                     assert(ios.width() == 0);
@@ -5106,7 +5106,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -5114,7 +5114,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -5124,7 +5124,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5132,7 +5132,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125*******");
                                     assert(ios.width() == 0);
@@ -5140,7 +5140,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5148,7 +5148,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5161,7 +5161,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -5169,7 +5169,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -5177,7 +5177,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -5185,7 +5185,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -5195,7 +5195,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -5203,7 +5203,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -5211,7 +5211,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -5219,7 +5219,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -5235,7 +5235,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125");
                                     assert(ios.width() == 0);
@@ -5243,7 +5243,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125**********");
                                     assert(ios.width() == 0);
@@ -5251,7 +5251,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1234567890.125");
                                     assert(ios.width() == 0);
@@ -5259,7 +5259,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1234567890.125");
                                     assert(ios.width() == 0);
@@ -5269,7 +5269,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5277,7 +5277,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125******");
                                     assert(ios.width() == 0);
@@ -5285,7 +5285,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5293,7 +5293,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5306,7 +5306,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -5314,7 +5314,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -5322,7 +5322,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -5330,7 +5330,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -5340,7 +5340,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -5348,7 +5348,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -5356,7 +5356,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -5364,7 +5364,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -5386,7 +5386,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125");
                                     assert(ios.width() == 0);
@@ -5394,7 +5394,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125***********");
                                     assert(ios.width() == 0);
@@ -5402,7 +5402,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -5410,7 +5410,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -5420,7 +5420,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5428,7 +5428,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125*******");
                                     assert(ios.width() == 0);
@@ -5436,7 +5436,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5444,7 +5444,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5457,7 +5457,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5465,7 +5465,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5473,7 +5473,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5481,7 +5481,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5491,7 +5491,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5499,7 +5499,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5507,7 +5507,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5515,7 +5515,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5531,7 +5531,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125");
                                     assert(ios.width() == 0);
@@ -5539,7 +5539,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125**********");
                                     assert(ios.width() == 0);
@@ -5547,7 +5547,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1234567890.125");
                                     assert(ios.width() == 0);
@@ -5555,7 +5555,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1234567890.125");
                                     assert(ios.width() == 0);
@@ -5565,7 +5565,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5573,7 +5573,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125******");
                                     assert(ios.width() == 0);
@@ -5581,7 +5581,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5589,7 +5589,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5602,7 +5602,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5610,7 +5610,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5618,7 +5618,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5626,7 +5626,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5636,7 +5636,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5644,7 +5644,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5652,7 +5652,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5660,7 +5660,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5679,7 +5679,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125");
                                     assert(ios.width() == 0);
@@ -5687,7 +5687,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125***********");
                                     assert(ios.width() == 0);
@@ -5695,7 +5695,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -5703,7 +5703,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -5713,7 +5713,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5721,7 +5721,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125*******");
                                     assert(ios.width() == 0);
@@ -5729,7 +5729,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5737,7 +5737,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5750,7 +5750,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5758,7 +5758,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5766,7 +5766,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5774,7 +5774,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5784,7 +5784,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5792,7 +5792,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5800,7 +5800,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5808,7 +5808,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5824,7 +5824,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125");
                                     assert(ios.width() == 0);
@@ -5832,7 +5832,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125**********");
                                     assert(ios.width() == 0);
@@ -5840,7 +5840,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1234567890.125");
                                     assert(ios.width() == 0);
@@ -5848,7 +5848,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1234567890.125");
                                     assert(ios.width() == 0);
@@ -5858,7 +5858,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5866,7 +5866,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125******");
                                     assert(ios.width() == 0);
@@ -5874,7 +5874,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5882,7 +5882,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -5895,7 +5895,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5903,7 +5903,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5911,7 +5911,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5919,7 +5919,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5929,7 +5929,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5937,7 +5937,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5945,7 +5945,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5953,7 +5953,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5970,7 +5970,7 @@
 void test3()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -5992,7 +5992,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -6000,7 +6000,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -6008,7 +6008,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -6016,7 +6016,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -6026,7 +6026,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -6034,7 +6034,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -6042,7 +6042,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -6050,7 +6050,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -6063,7 +6063,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -6071,7 +6071,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -6079,7 +6079,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -6087,7 +6087,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -6097,7 +6097,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -6105,7 +6105,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -6113,7 +6113,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -6121,7 +6121,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -6137,7 +6137,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -6145,7 +6145,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -6153,7 +6153,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -6161,7 +6161,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -6171,7 +6171,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -6179,7 +6179,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -6187,7 +6187,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -6195,7 +6195,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -6208,7 +6208,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -6216,7 +6216,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -6224,7 +6224,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -6232,7 +6232,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -6242,7 +6242,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -6250,7 +6250,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -6258,7 +6258,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -6266,7 +6266,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -6285,7 +6285,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -6293,7 +6293,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -6301,7 +6301,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -6309,7 +6309,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -6319,7 +6319,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -6327,7 +6327,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -6335,7 +6335,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -6343,7 +6343,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -6356,7 +6356,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -6364,7 +6364,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -6372,7 +6372,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -6380,7 +6380,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -6390,7 +6390,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -6398,7 +6398,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -6406,7 +6406,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -6414,7 +6414,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -6430,7 +6430,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -6438,7 +6438,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -6446,7 +6446,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -6454,7 +6454,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -6464,7 +6464,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -6472,7 +6472,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -6480,7 +6480,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -6488,7 +6488,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -6501,7 +6501,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -6509,7 +6509,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -6517,7 +6517,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -6525,7 +6525,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -6535,7 +6535,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -6543,7 +6543,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -6551,7 +6551,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -6559,7 +6559,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -6581,7 +6581,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0");
                                     assert(ios.width() == 0);
@@ -6589,7 +6589,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0**********************");
                                     assert(ios.width() == 0);
@@ -6597,7 +6597,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -6605,7 +6605,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -6615,7 +6615,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0");
                                     assert(ios.width() == 0);
@@ -6623,7 +6623,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0**********************");
                                     assert(ios.width() == 0);
@@ -6631,7 +6631,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -6639,7 +6639,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -6652,7 +6652,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0");
                                     assert(ios.width() == 0);
@@ -6660,7 +6660,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0**********************");
                                     assert(ios.width() == 0);
@@ -6668,7 +6668,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -6676,7 +6676,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -6686,7 +6686,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0");
                                     assert(ios.width() == 0);
@@ -6694,7 +6694,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0**********************");
                                     assert(ios.width() == 0);
@@ -6702,7 +6702,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -6710,7 +6710,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -6726,7 +6726,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0");
                                     assert(ios.width() == 0);
@@ -6734,7 +6734,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0*********************");
                                     assert(ios.width() == 0);
@@ -6742,7 +6742,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0.0");
                                     assert(ios.width() == 0);
@@ -6750,7 +6750,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0.0");
                                     assert(ios.width() == 0);
@@ -6760,7 +6760,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0");
                                     assert(ios.width() == 0);
@@ -6768,7 +6768,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0*********************");
                                     assert(ios.width() == 0);
@@ -6776,7 +6776,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0;0");
                                     assert(ios.width() == 0);
@@ -6784,7 +6784,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0;0");
                                     assert(ios.width() == 0);
@@ -6797,7 +6797,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0");
                                     assert(ios.width() == 0);
@@ -6805,7 +6805,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0*********************");
                                     assert(ios.width() == 0);
@@ -6813,7 +6813,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0.0");
                                     assert(ios.width() == 0);
@@ -6821,7 +6821,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0.0");
                                     assert(ios.width() == 0);
@@ -6831,7 +6831,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0");
                                     assert(ios.width() == 0);
@@ -6839,7 +6839,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0*********************");
                                     assert(ios.width() == 0);
@@ -6847,7 +6847,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0;0");
                                     assert(ios.width() == 0);
@@ -6855,7 +6855,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0;0");
                                     assert(ios.width() == 0);
@@ -6874,7 +6874,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0");
                                     assert(ios.width() == 0);
@@ -6882,7 +6882,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0**********************");
                                     assert(ios.width() == 0);
@@ -6890,7 +6890,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -6898,7 +6898,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -6908,7 +6908,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0");
                                     assert(ios.width() == 0);
@@ -6916,7 +6916,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0**********************");
                                     assert(ios.width() == 0);
@@ -6924,7 +6924,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -6932,7 +6932,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -6945,7 +6945,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0");
                                     assert(ios.width() == 0);
@@ -6953,7 +6953,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0**********************");
                                     assert(ios.width() == 0);
@@ -6961,7 +6961,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -6969,7 +6969,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -6979,7 +6979,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0");
                                     assert(ios.width() == 0);
@@ -6987,7 +6987,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0**********************");
                                     assert(ios.width() == 0);
@@ -6995,7 +6995,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -7003,7 +7003,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -7019,7 +7019,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0");
                                     assert(ios.width() == 0);
@@ -7027,7 +7027,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0*********************");
                                     assert(ios.width() == 0);
@@ -7035,7 +7035,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0.0");
                                     assert(ios.width() == 0);
@@ -7043,7 +7043,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0.0");
                                     assert(ios.width() == 0);
@@ -7053,7 +7053,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0");
                                     assert(ios.width() == 0);
@@ -7061,7 +7061,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0*********************");
                                     assert(ios.width() == 0);
@@ -7069,7 +7069,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0;0");
                                     assert(ios.width() == 0);
@@ -7077,7 +7077,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0;0");
                                     assert(ios.width() == 0);
@@ -7090,7 +7090,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0");
                                     assert(ios.width() == 0);
@@ -7098,7 +7098,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0*********************");
                                     assert(ios.width() == 0);
@@ -7106,7 +7106,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0.0");
                                     assert(ios.width() == 0);
@@ -7114,7 +7114,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0.0");
                                     assert(ios.width() == 0);
@@ -7124,7 +7124,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0");
                                     assert(ios.width() == 0);
@@ -7132,7 +7132,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0*********************");
                                     assert(ios.width() == 0);
@@ -7140,7 +7140,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0;0");
                                     assert(ios.width() == 0);
@@ -7148,7 +7148,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0;0");
                                     assert(ios.width() == 0);
@@ -7170,7 +7170,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000");
                                     assert(ios.width() == 0);
@@ -7178,7 +7178,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000*****************");
                                     assert(ios.width() == 0);
@@ -7186,7 +7186,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -7194,7 +7194,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -7204,7 +7204,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000");
                                     assert(ios.width() == 0);
@@ -7212,7 +7212,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000*****************");
                                     assert(ios.width() == 0);
@@ -7220,7 +7220,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -7228,7 +7228,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -7241,7 +7241,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000");
                                     assert(ios.width() == 0);
@@ -7249,7 +7249,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000*****************");
                                     assert(ios.width() == 0);
@@ -7257,7 +7257,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -7265,7 +7265,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -7275,7 +7275,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000");
                                     assert(ios.width() == 0);
@@ -7283,7 +7283,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000*****************");
                                     assert(ios.width() == 0);
@@ -7291,7 +7291,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -7299,7 +7299,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -7315,7 +7315,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000");
                                     assert(ios.width() == 0);
@@ -7323,7 +7323,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000****************");
                                     assert(ios.width() == 0);
@@ -7331,7 +7331,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0.000000");
                                     assert(ios.width() == 0);
@@ -7339,7 +7339,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0.000000");
                                     assert(ios.width() == 0);
@@ -7349,7 +7349,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000");
                                     assert(ios.width() == 0);
@@ -7357,7 +7357,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000****************");
                                     assert(ios.width() == 0);
@@ -7365,7 +7365,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0;000000");
                                     assert(ios.width() == 0);
@@ -7373,7 +7373,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0;000000");
                                     assert(ios.width() == 0);
@@ -7386,7 +7386,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000");
                                     assert(ios.width() == 0);
@@ -7394,7 +7394,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000****************");
                                     assert(ios.width() == 0);
@@ -7402,7 +7402,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0.000000");
                                     assert(ios.width() == 0);
@@ -7410,7 +7410,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0.000000");
                                     assert(ios.width() == 0);
@@ -7420,7 +7420,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000");
                                     assert(ios.width() == 0);
@@ -7428,7 +7428,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000****************");
                                     assert(ios.width() == 0);
@@ -7436,7 +7436,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0;000000");
                                     assert(ios.width() == 0);
@@ -7444,7 +7444,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0;000000");
                                     assert(ios.width() == 0);
@@ -7463,7 +7463,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000");
                                     assert(ios.width() == 0);
@@ -7471,7 +7471,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000*****************");
                                     assert(ios.width() == 0);
@@ -7479,7 +7479,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -7487,7 +7487,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -7497,7 +7497,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000");
                                     assert(ios.width() == 0);
@@ -7505,7 +7505,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000*****************");
                                     assert(ios.width() == 0);
@@ -7513,7 +7513,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -7521,7 +7521,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -7534,7 +7534,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000");
                                     assert(ios.width() == 0);
@@ -7542,7 +7542,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000*****************");
                                     assert(ios.width() == 0);
@@ -7550,7 +7550,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -7558,7 +7558,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -7568,7 +7568,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000");
                                     assert(ios.width() == 0);
@@ -7576,7 +7576,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000*****************");
                                     assert(ios.width() == 0);
@@ -7584,7 +7584,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -7592,7 +7592,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -7608,7 +7608,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000");
                                     assert(ios.width() == 0);
@@ -7616,7 +7616,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000****************");
                                     assert(ios.width() == 0);
@@ -7624,7 +7624,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0.000000");
                                     assert(ios.width() == 0);
@@ -7632,7 +7632,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0.000000");
                                     assert(ios.width() == 0);
@@ -7642,7 +7642,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000");
                                     assert(ios.width() == 0);
@@ -7650,7 +7650,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000****************");
                                     assert(ios.width() == 0);
@@ -7658,7 +7658,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0;000000");
                                     assert(ios.width() == 0);
@@ -7666,7 +7666,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0;000000");
                                     assert(ios.width() == 0);
@@ -7679,7 +7679,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000");
                                     assert(ios.width() == 0);
@@ -7687,7 +7687,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000****************");
                                     assert(ios.width() == 0);
@@ -7695,7 +7695,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0.000000");
                                     assert(ios.width() == 0);
@@ -7703,7 +7703,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0.000000");
                                     assert(ios.width() == 0);
@@ -7713,7 +7713,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000");
                                     assert(ios.width() == 0);
@@ -7721,7 +7721,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000****************");
                                     assert(ios.width() == 0);
@@ -7729,7 +7729,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0;000000");
                                     assert(ios.width() == 0);
@@ -7737,7 +7737,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0;000000");
                                     assert(ios.width() == 0);
@@ -7759,7 +7759,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7767,7 +7767,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -7775,7 +7775,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7783,7 +7783,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7793,7 +7793,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -7801,7 +7801,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -7809,7 +7809,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -7817,7 +7817,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -7830,7 +7830,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7838,7 +7838,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -7846,7 +7846,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7854,7 +7854,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7864,7 +7864,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -7872,7 +7872,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -7880,7 +7880,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -7888,7 +7888,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -7904,7 +7904,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7912,7 +7912,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -7920,7 +7920,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7928,7 +7928,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7938,7 +7938,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -7946,7 +7946,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -7954,7 +7954,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -7962,7 +7962,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -7975,7 +7975,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7983,7 +7983,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -7991,7 +7991,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -7999,7 +7999,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8009,7 +8009,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8017,7 +8017,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -8025,7 +8025,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8033,7 +8033,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8052,7 +8052,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8060,7 +8060,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -8068,7 +8068,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8076,7 +8076,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8086,7 +8086,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8094,7 +8094,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -8102,7 +8102,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8110,7 +8110,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8123,7 +8123,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8131,7 +8131,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -8139,7 +8139,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8147,7 +8147,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8157,7 +8157,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8165,7 +8165,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -8173,7 +8173,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8181,7 +8181,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8197,7 +8197,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8205,7 +8205,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -8213,7 +8213,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8221,7 +8221,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8231,7 +8231,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8239,7 +8239,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -8247,7 +8247,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8255,7 +8255,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8268,7 +8268,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8276,7 +8276,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -8284,7 +8284,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8292,7 +8292,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -8302,7 +8302,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8310,7 +8310,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -8318,7 +8318,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8326,7 +8326,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -8348,7 +8348,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8356,7 +8356,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8364,7 +8364,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8372,7 +8372,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8382,7 +8382,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8390,7 +8390,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8398,7 +8398,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8406,7 +8406,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8419,7 +8419,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8427,7 +8427,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8435,7 +8435,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8443,7 +8443,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8453,7 +8453,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8461,7 +8461,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8469,7 +8469,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8477,7 +8477,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8493,7 +8493,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8501,7 +8501,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8509,7 +8509,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8517,7 +8517,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8527,7 +8527,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8535,7 +8535,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8543,7 +8543,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8551,7 +8551,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8564,7 +8564,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8572,7 +8572,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8580,7 +8580,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8588,7 +8588,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8598,7 +8598,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8606,7 +8606,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8614,7 +8614,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8622,7 +8622,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8641,7 +8641,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8649,7 +8649,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8657,7 +8657,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8665,7 +8665,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8675,7 +8675,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8683,7 +8683,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8691,7 +8691,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8699,7 +8699,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8712,7 +8712,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8720,7 +8720,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8728,7 +8728,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8736,7 +8736,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8746,7 +8746,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8754,7 +8754,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8762,7 +8762,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8770,7 +8770,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8786,7 +8786,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8794,7 +8794,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8802,7 +8802,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8810,7 +8810,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8820,7 +8820,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8828,7 +8828,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8836,7 +8836,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8844,7 +8844,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8857,7 +8857,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8865,7 +8865,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8873,7 +8873,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8881,7 +8881,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8891,7 +8891,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8899,7 +8899,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8907,7 +8907,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8915,7 +8915,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8932,7 +8932,7 @@
 void test4()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -8954,7 +8954,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890");
                                     assert(ios.width() == 0);
@@ -8962,7 +8962,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890***************");
                                     assert(ios.width() == 0);
@@ -8970,7 +8970,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***************1234567890");
                                     assert(ios.width() == 0);
@@ -8978,7 +8978,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***************1234567890");
                                     assert(ios.width() == 0);
@@ -8988,7 +8988,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -8996,7 +8996,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0***********");
                                     assert(ios.width() == 0);
@@ -9004,7 +9004,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9012,7 +9012,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9025,7 +9025,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.");
                                     assert(ios.width() == 0);
@@ -9033,7 +9033,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.**************");
                                     assert(ios.width() == 0);
@@ -9041,7 +9041,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1234567890.");
                                     assert(ios.width() == 0);
@@ -9049,7 +9049,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1234567890.");
                                     assert(ios.width() == 0);
@@ -9059,7 +9059,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9067,7 +9067,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;**********");
                                     assert(ios.width() == 0);
@@ -9075,7 +9075,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9083,7 +9083,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9099,7 +9099,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890");
                                     assert(ios.width() == 0);
@@ -9107,7 +9107,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890**************");
                                     assert(ios.width() == 0);
@@ -9115,7 +9115,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************+1234567890");
                                     assert(ios.width() == 0);
@@ -9123,7 +9123,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**************1234567890");
                                     assert(ios.width() == 0);
@@ -9133,7 +9133,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9141,7 +9141,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0**********");
                                     assert(ios.width() == 0);
@@ -9149,7 +9149,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9157,7 +9157,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9170,7 +9170,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.");
                                     assert(ios.width() == 0);
@@ -9178,7 +9178,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.*************");
                                     assert(ios.width() == 0);
@@ -9186,7 +9186,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1234567890.");
                                     assert(ios.width() == 0);
@@ -9194,7 +9194,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1234567890.");
                                     assert(ios.width() == 0);
@@ -9204,7 +9204,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9212,7 +9212,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;*********");
                                     assert(ios.width() == 0);
@@ -9220,7 +9220,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********+1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9228,7 +9228,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9247,7 +9247,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890");
                                     assert(ios.width() == 0);
@@ -9255,7 +9255,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890***************");
                                     assert(ios.width() == 0);
@@ -9263,7 +9263,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***************1234567890");
                                     assert(ios.width() == 0);
@@ -9271,7 +9271,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***************1234567890");
                                     assert(ios.width() == 0);
@@ -9281,7 +9281,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9289,7 +9289,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0***********");
                                     assert(ios.width() == 0);
@@ -9297,7 +9297,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9305,7 +9305,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9318,7 +9318,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.");
                                     assert(ios.width() == 0);
@@ -9326,7 +9326,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.**************");
                                     assert(ios.width() == 0);
@@ -9334,7 +9334,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1234567890.");
                                     assert(ios.width() == 0);
@@ -9342,7 +9342,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1234567890.");
                                     assert(ios.width() == 0);
@@ -9352,7 +9352,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9360,7 +9360,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;**********");
                                     assert(ios.width() == 0);
@@ -9368,7 +9368,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9376,7 +9376,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9392,7 +9392,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890");
                                     assert(ios.width() == 0);
@@ -9400,7 +9400,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890**************");
                                     assert(ios.width() == 0);
@@ -9408,7 +9408,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************+1234567890");
                                     assert(ios.width() == 0);
@@ -9416,7 +9416,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**************1234567890");
                                     assert(ios.width() == 0);
@@ -9426,7 +9426,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9434,7 +9434,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0**********");
                                     assert(ios.width() == 0);
@@ -9442,7 +9442,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9450,7 +9450,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -9463,7 +9463,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.");
                                     assert(ios.width() == 0);
@@ -9471,7 +9471,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.*************");
                                     assert(ios.width() == 0);
@@ -9479,7 +9479,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1234567890.");
                                     assert(ios.width() == 0);
@@ -9487,7 +9487,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1234567890.");
                                     assert(ios.width() == 0);
@@ -9497,7 +9497,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9505,7 +9505,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;*********");
                                     assert(ios.width() == 0);
@@ -9513,7 +9513,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********+1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9521,7 +9521,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -9543,7 +9543,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1");
                                     assert(ios.width() == 0);
@@ -9551,7 +9551,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1*************");
                                     assert(ios.width() == 0);
@@ -9559,7 +9559,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9567,7 +9567,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9577,7 +9577,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9585,7 +9585,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1*********");
                                     assert(ios.width() == 0);
@@ -9593,7 +9593,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9601,7 +9601,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9614,7 +9614,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1");
                                     assert(ios.width() == 0);
@@ -9622,7 +9622,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1*************");
                                     assert(ios.width() == 0);
@@ -9630,7 +9630,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9638,7 +9638,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9648,7 +9648,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9656,7 +9656,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1*********");
                                     assert(ios.width() == 0);
@@ -9664,7 +9664,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9672,7 +9672,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9688,7 +9688,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1");
                                     assert(ios.width() == 0);
@@ -9696,7 +9696,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1************");
                                     assert(ios.width() == 0);
@@ -9704,7 +9704,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************+1234567890.1");
                                     assert(ios.width() == 0);
@@ -9712,7 +9712,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9722,7 +9722,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9730,7 +9730,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1********");
                                     assert(ios.width() == 0);
@@ -9738,7 +9738,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9746,7 +9746,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9759,7 +9759,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1");
                                     assert(ios.width() == 0);
@@ -9767,7 +9767,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1************");
                                     assert(ios.width() == 0);
@@ -9775,7 +9775,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************+1234567890.1");
                                     assert(ios.width() == 0);
@@ -9783,7 +9783,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9793,7 +9793,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9801,7 +9801,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1********");
                                     assert(ios.width() == 0);
@@ -9809,7 +9809,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9817,7 +9817,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9836,7 +9836,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1");
                                     assert(ios.width() == 0);
@@ -9844,7 +9844,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1*************");
                                     assert(ios.width() == 0);
@@ -9852,7 +9852,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9860,7 +9860,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9870,7 +9870,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9878,7 +9878,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1*********");
                                     assert(ios.width() == 0);
@@ -9886,7 +9886,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9894,7 +9894,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9907,7 +9907,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1");
                                     assert(ios.width() == 0);
@@ -9915,7 +9915,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1*************");
                                     assert(ios.width() == 0);
@@ -9923,7 +9923,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9931,7 +9931,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -9941,7 +9941,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9949,7 +9949,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1*********");
                                     assert(ios.width() == 0);
@@ -9957,7 +9957,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9965,7 +9965,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -9981,7 +9981,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1");
                                     assert(ios.width() == 0);
@@ -9989,7 +9989,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1************");
                                     assert(ios.width() == 0);
@@ -9997,7 +9997,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************+1234567890.1");
                                     assert(ios.width() == 0);
@@ -10005,7 +10005,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+************1234567890.1");
                                     assert(ios.width() == 0);
@@ -10015,7 +10015,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -10023,7 +10023,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1********");
                                     assert(ios.width() == 0);
@@ -10031,7 +10031,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -10039,7 +10039,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -10052,7 +10052,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1");
                                     assert(ios.width() == 0);
@@ -10060,7 +10060,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1************");
                                     assert(ios.width() == 0);
@@ -10068,7 +10068,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************+1234567890.1");
                                     assert(ios.width() == 0);
@@ -10076,7 +10076,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+************1234567890.1");
                                     assert(ios.width() == 0);
@@ -10086,7 +10086,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -10094,7 +10094,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1********");
                                     assert(ios.width() == 0);
@@ -10102,7 +10102,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -10110,7 +10110,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -10132,7 +10132,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10140,7 +10140,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -10148,7 +10148,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10156,7 +10156,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10166,7 +10166,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10174,7 +10174,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -10182,7 +10182,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10190,7 +10190,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10203,7 +10203,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10211,7 +10211,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -10219,7 +10219,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10227,7 +10227,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10237,7 +10237,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10245,7 +10245,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -10253,7 +10253,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10261,7 +10261,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10277,7 +10277,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10285,7 +10285,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -10293,7 +10293,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10301,7 +10301,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10311,7 +10311,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10319,7 +10319,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -10327,7 +10327,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10335,7 +10335,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10348,7 +10348,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10356,7 +10356,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -10364,7 +10364,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10372,7 +10372,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10382,7 +10382,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10390,7 +10390,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -10398,7 +10398,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10406,7 +10406,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10425,7 +10425,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10433,7 +10433,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -10441,7 +10441,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10449,7 +10449,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10459,7 +10459,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10467,7 +10467,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -10475,7 +10475,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10483,7 +10483,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10496,7 +10496,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10504,7 +10504,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -10512,7 +10512,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10520,7 +10520,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10530,7 +10530,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10538,7 +10538,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -10546,7 +10546,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10554,7 +10554,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10570,7 +10570,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10578,7 +10578,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -10586,7 +10586,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10594,7 +10594,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10604,7 +10604,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10612,7 +10612,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -10620,7 +10620,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10628,7 +10628,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10641,7 +10641,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10649,7 +10649,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -10657,7 +10657,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10665,7 +10665,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -10675,7 +10675,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10683,7 +10683,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -10691,7 +10691,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10699,7 +10699,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -10720,7 +10720,7 @@
 void test5()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -10742,7 +10742,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00");
                                     assert(ios.width() == 0);
@@ -10750,7 +10750,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00*******************");
                                     assert(ios.width() == 0);
@@ -10758,7 +10758,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0e+00");
                                     assert(ios.width() == 0);
@@ -10766,7 +10766,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0e+00");
                                     assert(ios.width() == 0);
@@ -10776,7 +10776,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00");
                                     assert(ios.width() == 0);
@@ -10784,7 +10784,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00*******************");
                                     assert(ios.width() == 0);
@@ -10792,7 +10792,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0e+00");
                                     assert(ios.width() == 0);
@@ -10800,7 +10800,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0e+00");
                                     assert(ios.width() == 0);
@@ -10813,7 +10813,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.e+00");
                                     assert(ios.width() == 0);
@@ -10821,7 +10821,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.e+00******************");
                                     assert(ios.width() == 0);
@@ -10829,7 +10829,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0.e+00");
                                     assert(ios.width() == 0);
@@ -10837,7 +10837,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0.e+00");
                                     assert(ios.width() == 0);
@@ -10847,7 +10847,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;e+00");
                                     assert(ios.width() == 0);
@@ -10855,7 +10855,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;e+00******************");
                                     assert(ios.width() == 0);
@@ -10863,7 +10863,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0;e+00");
                                     assert(ios.width() == 0);
@@ -10871,7 +10871,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0;e+00");
                                     assert(ios.width() == 0);
@@ -10887,7 +10887,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00");
                                     assert(ios.width() == 0);
@@ -10895,7 +10895,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00*******************");
                                     assert(ios.width() == 0);
@@ -10903,7 +10903,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0e+00");
                                     assert(ios.width() == 0);
@@ -10911,7 +10911,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0e+00");
                                     assert(ios.width() == 0);
@@ -10921,7 +10921,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00");
                                     assert(ios.width() == 0);
@@ -10929,7 +10929,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00*******************");
                                     assert(ios.width() == 0);
@@ -10937,7 +10937,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0e+00");
                                     assert(ios.width() == 0);
@@ -10945,7 +10945,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0e+00");
                                     assert(ios.width() == 0);
@@ -10958,7 +10958,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.e+00");
                                     assert(ios.width() == 0);
@@ -10966,7 +10966,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.e+00******************");
                                     assert(ios.width() == 0);
@@ -10974,7 +10974,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0.e+00");
                                     assert(ios.width() == 0);
@@ -10982,7 +10982,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0.e+00");
                                     assert(ios.width() == 0);
@@ -10992,7 +10992,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;e+00");
                                     assert(ios.width() == 0);
@@ -11000,7 +11000,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;e+00******************");
                                     assert(ios.width() == 0);
@@ -11008,7 +11008,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0;e+00");
                                     assert(ios.width() == 0);
@@ -11016,7 +11016,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0;e+00");
                                     assert(ios.width() == 0);
@@ -11035,7 +11035,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00");
                                     assert(ios.width() == 0);
@@ -11043,7 +11043,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00*******************");
                                     assert(ios.width() == 0);
@@ -11051,7 +11051,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0E+00");
                                     assert(ios.width() == 0);
@@ -11059,7 +11059,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0E+00");
                                     assert(ios.width() == 0);
@@ -11069,7 +11069,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00");
                                     assert(ios.width() == 0);
@@ -11077,7 +11077,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00*******************");
                                     assert(ios.width() == 0);
@@ -11085,7 +11085,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0E+00");
                                     assert(ios.width() == 0);
@@ -11093,7 +11093,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0E+00");
                                     assert(ios.width() == 0);
@@ -11106,7 +11106,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.E+00");
                                     assert(ios.width() == 0);
@@ -11114,7 +11114,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.E+00******************");
                                     assert(ios.width() == 0);
@@ -11122,7 +11122,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0.E+00");
                                     assert(ios.width() == 0);
@@ -11130,7 +11130,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0.E+00");
                                     assert(ios.width() == 0);
@@ -11140,7 +11140,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;E+00");
                                     assert(ios.width() == 0);
@@ -11148,7 +11148,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;E+00******************");
                                     assert(ios.width() == 0);
@@ -11156,7 +11156,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0;E+00");
                                     assert(ios.width() == 0);
@@ -11164,7 +11164,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0;E+00");
                                     assert(ios.width() == 0);
@@ -11180,7 +11180,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00");
                                     assert(ios.width() == 0);
@@ -11188,7 +11188,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00*******************");
                                     assert(ios.width() == 0);
@@ -11196,7 +11196,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0E+00");
                                     assert(ios.width() == 0);
@@ -11204,7 +11204,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0E+00");
                                     assert(ios.width() == 0);
@@ -11214,7 +11214,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00");
                                     assert(ios.width() == 0);
@@ -11222,7 +11222,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00*******************");
                                     assert(ios.width() == 0);
@@ -11230,7 +11230,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0E+00");
                                     assert(ios.width() == 0);
@@ -11238,7 +11238,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0E+00");
                                     assert(ios.width() == 0);
@@ -11251,7 +11251,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.E+00");
                                     assert(ios.width() == 0);
@@ -11259,7 +11259,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.E+00******************");
                                     assert(ios.width() == 0);
@@ -11267,7 +11267,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0.E+00");
                                     assert(ios.width() == 0);
@@ -11275,7 +11275,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0.E+00");
                                     assert(ios.width() == 0);
@@ -11285,7 +11285,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;E+00");
                                     assert(ios.width() == 0);
@@ -11293,7 +11293,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;E+00******************");
                                     assert(ios.width() == 0);
@@ -11301,7 +11301,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0;E+00");
                                     assert(ios.width() == 0);
@@ -11309,7 +11309,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0;E+00");
                                     assert(ios.width() == 0);
@@ -11331,7 +11331,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00");
                                     assert(ios.width() == 0);
@@ -11339,7 +11339,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00*****************");
                                     assert(ios.width() == 0);
@@ -11347,7 +11347,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0e+00");
                                     assert(ios.width() == 0);
@@ -11355,7 +11355,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0e+00");
                                     assert(ios.width() == 0);
@@ -11365,7 +11365,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00");
                                     assert(ios.width() == 0);
@@ -11373,7 +11373,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00*****************");
                                     assert(ios.width() == 0);
@@ -11381,7 +11381,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0e+00");
                                     assert(ios.width() == 0);
@@ -11389,7 +11389,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0e+00");
                                     assert(ios.width() == 0);
@@ -11402,7 +11402,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00");
                                     assert(ios.width() == 0);
@@ -11410,7 +11410,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00*****************");
                                     assert(ios.width() == 0);
@@ -11418,7 +11418,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0e+00");
                                     assert(ios.width() == 0);
@@ -11426,7 +11426,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0e+00");
                                     assert(ios.width() == 0);
@@ -11436,7 +11436,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00");
                                     assert(ios.width() == 0);
@@ -11444,7 +11444,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00*****************");
                                     assert(ios.width() == 0);
@@ -11452,7 +11452,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0e+00");
                                     assert(ios.width() == 0);
@@ -11460,7 +11460,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0e+00");
                                     assert(ios.width() == 0);
@@ -11476,7 +11476,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00");
                                     assert(ios.width() == 0);
@@ -11484,7 +11484,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00*****************");
                                     assert(ios.width() == 0);
@@ -11492,7 +11492,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0e+00");
                                     assert(ios.width() == 0);
@@ -11500,7 +11500,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0e+00");
                                     assert(ios.width() == 0);
@@ -11510,7 +11510,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00");
                                     assert(ios.width() == 0);
@@ -11518,7 +11518,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00*****************");
                                     assert(ios.width() == 0);
@@ -11526,7 +11526,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0e+00");
                                     assert(ios.width() == 0);
@@ -11534,7 +11534,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0e+00");
                                     assert(ios.width() == 0);
@@ -11547,7 +11547,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00");
                                     assert(ios.width() == 0);
@@ -11555,7 +11555,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00*****************");
                                     assert(ios.width() == 0);
@@ -11563,7 +11563,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0e+00");
                                     assert(ios.width() == 0);
@@ -11571,7 +11571,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0e+00");
                                     assert(ios.width() == 0);
@@ -11581,7 +11581,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00");
                                     assert(ios.width() == 0);
@@ -11589,7 +11589,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00*****************");
                                     assert(ios.width() == 0);
@@ -11597,7 +11597,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0e+00");
                                     assert(ios.width() == 0);
@@ -11605,7 +11605,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0e+00");
                                     assert(ios.width() == 0);
@@ -11624,7 +11624,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00");
                                     assert(ios.width() == 0);
@@ -11632,7 +11632,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00*****************");
                                     assert(ios.width() == 0);
@@ -11640,7 +11640,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0E+00");
                                     assert(ios.width() == 0);
@@ -11648,7 +11648,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0E+00");
                                     assert(ios.width() == 0);
@@ -11658,7 +11658,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00");
                                     assert(ios.width() == 0);
@@ -11666,7 +11666,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00*****************");
                                     assert(ios.width() == 0);
@@ -11674,7 +11674,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0E+00");
                                     assert(ios.width() == 0);
@@ -11682,7 +11682,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0E+00");
                                     assert(ios.width() == 0);
@@ -11695,7 +11695,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00");
                                     assert(ios.width() == 0);
@@ -11703,7 +11703,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00*****************");
                                     assert(ios.width() == 0);
@@ -11711,7 +11711,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0E+00");
                                     assert(ios.width() == 0);
@@ -11719,7 +11719,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0E+00");
                                     assert(ios.width() == 0);
@@ -11729,7 +11729,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00");
                                     assert(ios.width() == 0);
@@ -11737,7 +11737,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00*****************");
                                     assert(ios.width() == 0);
@@ -11745,7 +11745,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0E+00");
                                     assert(ios.width() == 0);
@@ -11753,7 +11753,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0E+00");
                                     assert(ios.width() == 0);
@@ -11769,7 +11769,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00");
                                     assert(ios.width() == 0);
@@ -11777,7 +11777,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00*****************");
                                     assert(ios.width() == 0);
@@ -11785,7 +11785,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0E+00");
                                     assert(ios.width() == 0);
@@ -11793,7 +11793,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0E+00");
                                     assert(ios.width() == 0);
@@ -11803,7 +11803,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00");
                                     assert(ios.width() == 0);
@@ -11811,7 +11811,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00*****************");
                                     assert(ios.width() == 0);
@@ -11819,7 +11819,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0E+00");
                                     assert(ios.width() == 0);
@@ -11827,7 +11827,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0E+00");
                                     assert(ios.width() == 0);
@@ -11840,7 +11840,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00");
                                     assert(ios.width() == 0);
@@ -11848,7 +11848,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00*****************");
                                     assert(ios.width() == 0);
@@ -11856,7 +11856,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0E+00");
                                     assert(ios.width() == 0);
@@ -11864,7 +11864,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0E+00");
                                     assert(ios.width() == 0);
@@ -11874,7 +11874,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00");
                                     assert(ios.width() == 0);
@@ -11882,7 +11882,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00*****************");
                                     assert(ios.width() == 0);
@@ -11890,7 +11890,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0E+00");
                                     assert(ios.width() == 0);
@@ -11898,7 +11898,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0E+00");
                                     assert(ios.width() == 0);
@@ -11920,7 +11920,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -11928,7 +11928,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00************");
                                     assert(ios.width() == 0);
@@ -11936,7 +11936,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -11944,7 +11944,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000e+00");
                                     assert(ios.width() == 0);
@@ -11954,7 +11954,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -11962,7 +11962,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00************");
                                     assert(ios.width() == 0);
@@ -11970,7 +11970,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -11978,7 +11978,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000e+00");
                                     assert(ios.width() == 0);
@@ -11991,7 +11991,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -11999,7 +11999,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00************");
                                     assert(ios.width() == 0);
@@ -12007,7 +12007,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -12015,7 +12015,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000e+00");
                                     assert(ios.width() == 0);
@@ -12025,7 +12025,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -12033,7 +12033,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00************");
                                     assert(ios.width() == 0);
@@ -12041,7 +12041,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -12049,7 +12049,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000e+00");
                                     assert(ios.width() == 0);
@@ -12065,7 +12065,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -12073,7 +12073,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00************");
                                     assert(ios.width() == 0);
@@ -12081,7 +12081,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -12089,7 +12089,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000e+00");
                                     assert(ios.width() == 0);
@@ -12099,7 +12099,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -12107,7 +12107,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00************");
                                     assert(ios.width() == 0);
@@ -12115,7 +12115,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -12123,7 +12123,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000e+00");
                                     assert(ios.width() == 0);
@@ -12136,7 +12136,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -12144,7 +12144,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00************");
                                     assert(ios.width() == 0);
@@ -12152,7 +12152,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -12160,7 +12160,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000e+00");
                                     assert(ios.width() == 0);
@@ -12170,7 +12170,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -12178,7 +12178,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00************");
                                     assert(ios.width() == 0);
@@ -12186,7 +12186,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -12194,7 +12194,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000e+00");
                                     assert(ios.width() == 0);
@@ -12213,7 +12213,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12221,7 +12221,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00************");
                                     assert(ios.width() == 0);
@@ -12229,7 +12229,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12237,7 +12237,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12247,7 +12247,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12255,7 +12255,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00************");
                                     assert(ios.width() == 0);
@@ -12263,7 +12263,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12271,7 +12271,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12284,7 +12284,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12292,7 +12292,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00************");
                                     assert(ios.width() == 0);
@@ -12300,7 +12300,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12308,7 +12308,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12318,7 +12318,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12326,7 +12326,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00************");
                                     assert(ios.width() == 0);
@@ -12334,7 +12334,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12342,7 +12342,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12358,7 +12358,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12366,7 +12366,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00************");
                                     assert(ios.width() == 0);
@@ -12374,7 +12374,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12382,7 +12382,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12392,7 +12392,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12400,7 +12400,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00************");
                                     assert(ios.width() == 0);
@@ -12408,7 +12408,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12416,7 +12416,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12429,7 +12429,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12437,7 +12437,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00************");
                                     assert(ios.width() == 0);
@@ -12445,7 +12445,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12453,7 +12453,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000E+00");
                                     assert(ios.width() == 0);
@@ -12463,7 +12463,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12471,7 +12471,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00************");
                                     assert(ios.width() == 0);
@@ -12479,7 +12479,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12487,7 +12487,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000E+00");
                                     assert(ios.width() == 0);
@@ -12510,7 +12510,7 @@
 void test6()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -12532,7 +12532,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -12540,7 +12540,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -12548,7 +12548,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -12556,7 +12556,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -12566,7 +12566,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -12574,7 +12574,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -12582,7 +12582,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -12590,7 +12590,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -12603,7 +12603,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09");
                                     assert(ios.width() == 0);
@@ -12611,7 +12611,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09*******************");
                                     assert(ios.width() == 0);
@@ -12619,7 +12619,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -12627,7 +12627,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -12637,7 +12637,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09");
                                     assert(ios.width() == 0);
@@ -12645,7 +12645,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09*******************");
                                     assert(ios.width() == 0);
@@ -12653,7 +12653,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -12661,7 +12661,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -12677,7 +12677,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -12685,7 +12685,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -12693,7 +12693,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -12701,7 +12701,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -12711,7 +12711,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -12719,7 +12719,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -12727,7 +12727,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -12735,7 +12735,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -12748,7 +12748,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09");
                                     assert(ios.width() == 0);
@@ -12756,7 +12756,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09******************");
                                     assert(ios.width() == 0);
@@ -12764,7 +12764,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.e+09");
                                     assert(ios.width() == 0);
@@ -12772,7 +12772,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.e+09");
                                     assert(ios.width() == 0);
@@ -12782,7 +12782,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09");
                                     assert(ios.width() == 0);
@@ -12790,7 +12790,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09******************");
                                     assert(ios.width() == 0);
@@ -12798,7 +12798,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;e+09");
                                     assert(ios.width() == 0);
@@ -12806,7 +12806,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;e+09");
                                     assert(ios.width() == 0);
@@ -12825,7 +12825,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -12833,7 +12833,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -12841,7 +12841,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -12849,7 +12849,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -12859,7 +12859,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -12867,7 +12867,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -12875,7 +12875,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -12883,7 +12883,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -12896,7 +12896,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09");
                                     assert(ios.width() == 0);
@@ -12904,7 +12904,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09*******************");
                                     assert(ios.width() == 0);
@@ -12912,7 +12912,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -12920,7 +12920,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -12930,7 +12930,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09");
                                     assert(ios.width() == 0);
@@ -12938,7 +12938,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09*******************");
                                     assert(ios.width() == 0);
@@ -12946,7 +12946,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -12954,7 +12954,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -12970,7 +12970,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -12978,7 +12978,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -12986,7 +12986,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -12994,7 +12994,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -13004,7 +13004,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -13012,7 +13012,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -13020,7 +13020,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -13028,7 +13028,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -13041,7 +13041,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09");
                                     assert(ios.width() == 0);
@@ -13049,7 +13049,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09******************");
                                     assert(ios.width() == 0);
@@ -13057,7 +13057,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.E+09");
                                     assert(ios.width() == 0);
@@ -13065,7 +13065,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.E+09");
                                     assert(ios.width() == 0);
@@ -13075,7 +13075,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09");
                                     assert(ios.width() == 0);
@@ -13083,7 +13083,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09******************");
                                     assert(ios.width() == 0);
@@ -13091,7 +13091,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;E+09");
                                     assert(ios.width() == 0);
@@ -13099,7 +13099,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;E+09");
                                     assert(ios.width() == 0);
@@ -13121,7 +13121,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2e+09");
                                     assert(ios.width() == 0);
@@ -13129,7 +13129,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2e+09******************");
                                     assert(ios.width() == 0);
@@ -13137,7 +13137,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2e+09");
                                     assert(ios.width() == 0);
@@ -13145,7 +13145,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2e+09");
                                     assert(ios.width() == 0);
@@ -13155,7 +13155,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2e+09");
                                     assert(ios.width() == 0);
@@ -13163,7 +13163,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2e+09******************");
                                     assert(ios.width() == 0);
@@ -13171,7 +13171,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2e+09");
                                     assert(ios.width() == 0);
@@ -13179,7 +13179,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2e+09");
                                     assert(ios.width() == 0);
@@ -13192,7 +13192,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2e+09");
                                     assert(ios.width() == 0);
@@ -13200,7 +13200,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2e+09******************");
                                     assert(ios.width() == 0);
@@ -13208,7 +13208,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2e+09");
                                     assert(ios.width() == 0);
@@ -13216,7 +13216,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2e+09");
                                     assert(ios.width() == 0);
@@ -13226,7 +13226,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2e+09");
                                     assert(ios.width() == 0);
@@ -13234,7 +13234,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2e+09******************");
                                     assert(ios.width() == 0);
@@ -13242,7 +13242,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2e+09");
                                     assert(ios.width() == 0);
@@ -13250,7 +13250,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2e+09");
                                     assert(ios.width() == 0);
@@ -13266,7 +13266,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2e+09");
                                     assert(ios.width() == 0);
@@ -13274,7 +13274,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2e+09*****************");
                                     assert(ios.width() == 0);
@@ -13282,7 +13282,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1.2e+09");
                                     assert(ios.width() == 0);
@@ -13290,7 +13290,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1.2e+09");
                                     assert(ios.width() == 0);
@@ -13300,7 +13300,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2e+09");
                                     assert(ios.width() == 0);
@@ -13308,7 +13308,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2e+09*****************");
                                     assert(ios.width() == 0);
@@ -13316,7 +13316,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1;2e+09");
                                     assert(ios.width() == 0);
@@ -13324,7 +13324,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1;2e+09");
                                     assert(ios.width() == 0);
@@ -13337,7 +13337,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2e+09");
                                     assert(ios.width() == 0);
@@ -13345,7 +13345,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2e+09*****************");
                                     assert(ios.width() == 0);
@@ -13353,7 +13353,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1.2e+09");
                                     assert(ios.width() == 0);
@@ -13361,7 +13361,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1.2e+09");
                                     assert(ios.width() == 0);
@@ -13371,7 +13371,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2e+09");
                                     assert(ios.width() == 0);
@@ -13379,7 +13379,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2e+09*****************");
                                     assert(ios.width() == 0);
@@ -13387,7 +13387,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1;2e+09");
                                     assert(ios.width() == 0);
@@ -13395,7 +13395,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1;2e+09");
                                     assert(ios.width() == 0);
@@ -13414,7 +13414,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2E+09");
                                     assert(ios.width() == 0);
@@ -13422,7 +13422,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2E+09******************");
                                     assert(ios.width() == 0);
@@ -13430,7 +13430,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2E+09");
                                     assert(ios.width() == 0);
@@ -13438,7 +13438,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2E+09");
                                     assert(ios.width() == 0);
@@ -13448,7 +13448,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2E+09");
                                     assert(ios.width() == 0);
@@ -13456,7 +13456,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2E+09******************");
                                     assert(ios.width() == 0);
@@ -13464,7 +13464,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2E+09");
                                     assert(ios.width() == 0);
@@ -13472,7 +13472,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2E+09");
                                     assert(ios.width() == 0);
@@ -13485,7 +13485,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2E+09");
                                     assert(ios.width() == 0);
@@ -13493,7 +13493,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2E+09******************");
                                     assert(ios.width() == 0);
@@ -13501,7 +13501,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2E+09");
                                     assert(ios.width() == 0);
@@ -13509,7 +13509,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2E+09");
                                     assert(ios.width() == 0);
@@ -13519,7 +13519,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2E+09");
                                     assert(ios.width() == 0);
@@ -13527,7 +13527,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2E+09******************");
                                     assert(ios.width() == 0);
@@ -13535,7 +13535,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2E+09");
                                     assert(ios.width() == 0);
@@ -13543,7 +13543,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2E+09");
                                     assert(ios.width() == 0);
@@ -13559,7 +13559,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2E+09");
                                     assert(ios.width() == 0);
@@ -13567,7 +13567,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2E+09*****************");
                                     assert(ios.width() == 0);
@@ -13575,7 +13575,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1.2E+09");
                                     assert(ios.width() == 0);
@@ -13583,7 +13583,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1.2E+09");
                                     assert(ios.width() == 0);
@@ -13593,7 +13593,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2E+09");
                                     assert(ios.width() == 0);
@@ -13601,7 +13601,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2E+09*****************");
                                     assert(ios.width() == 0);
@@ -13609,7 +13609,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1;2E+09");
                                     assert(ios.width() == 0);
@@ -13617,7 +13617,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1;2E+09");
                                     assert(ios.width() == 0);
@@ -13630,7 +13630,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2E+09");
                                     assert(ios.width() == 0);
@@ -13638,7 +13638,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2E+09*****************");
                                     assert(ios.width() == 0);
@@ -13646,7 +13646,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1.2E+09");
                                     assert(ios.width() == 0);
@@ -13654,7 +13654,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1.2E+09");
                                     assert(ios.width() == 0);
@@ -13664,7 +13664,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2E+09");
                                     assert(ios.width() == 0);
@@ -13672,7 +13672,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2E+09*****************");
                                     assert(ios.width() == 0);
@@ -13680,7 +13680,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1;2E+09");
                                     assert(ios.width() == 0);
@@ -13688,7 +13688,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1;2E+09");
                                     assert(ios.width() == 0);
@@ -13716,7 +13716,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13724,7 +13724,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13732,7 +13732,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13740,7 +13740,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13750,7 +13750,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13758,7 +13758,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13766,7 +13766,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13774,7 +13774,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13787,7 +13787,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13795,7 +13795,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13803,7 +13803,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13811,7 +13811,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13821,7 +13821,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13829,7 +13829,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13837,7 +13837,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13845,7 +13845,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13861,7 +13861,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13869,7 +13869,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13877,7 +13877,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13885,7 +13885,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13895,7 +13895,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13903,7 +13903,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13911,7 +13911,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13919,7 +13919,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13932,7 +13932,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13940,7 +13940,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13948,7 +13948,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13956,7 +13956,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13966,7 +13966,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13974,7 +13974,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13982,7 +13982,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -13990,7 +13990,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -14009,7 +14009,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14017,7 +14017,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14025,7 +14025,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14033,7 +14033,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14043,7 +14043,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14051,7 +14051,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14059,7 +14059,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14067,7 +14067,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14080,7 +14080,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14088,7 +14088,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14096,7 +14096,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14104,7 +14104,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14114,7 +14114,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14122,7 +14122,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14130,7 +14130,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14138,7 +14138,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14154,7 +14154,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14162,7 +14162,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14170,7 +14170,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14178,7 +14178,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14188,7 +14188,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14196,7 +14196,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14204,7 +14204,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14212,7 +14212,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14225,7 +14225,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14233,7 +14233,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14241,7 +14241,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14249,7 +14249,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14259,7 +14259,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14267,7 +14267,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14275,7 +14275,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14283,7 +14283,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -14300,7 +14300,7 @@
 void test7()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -14322,7 +14322,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14330,7 +14330,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -14338,7 +14338,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14346,7 +14346,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -14356,7 +14356,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14364,7 +14364,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -14372,7 +14372,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14380,7 +14380,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -14393,7 +14393,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -14401,7 +14401,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -14409,7 +14409,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -14417,7 +14417,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -14427,7 +14427,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -14435,7 +14435,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -14443,7 +14443,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -14451,7 +14451,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -14467,7 +14467,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14475,7 +14475,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -14483,7 +14483,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14491,7 +14491,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -14501,7 +14501,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14509,7 +14509,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -14517,7 +14517,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14525,7 +14525,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -14538,7 +14538,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -14546,7 +14546,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -14554,7 +14554,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -14562,7 +14562,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -14572,7 +14572,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -14580,7 +14580,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -14588,7 +14588,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -14596,7 +14596,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -14615,7 +14615,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -14623,7 +14623,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -14631,7 +14631,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -14639,7 +14639,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -14649,7 +14649,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -14657,7 +14657,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -14665,7 +14665,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -14673,7 +14673,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -14686,7 +14686,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -14694,7 +14694,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -14702,7 +14702,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -14710,7 +14710,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -14720,7 +14720,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -14728,7 +14728,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -14736,7 +14736,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -14744,7 +14744,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -14760,7 +14760,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -14768,7 +14768,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -14776,7 +14776,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -14784,7 +14784,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -14794,7 +14794,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -14802,7 +14802,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -14810,7 +14810,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -14818,7 +14818,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -14831,7 +14831,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -14839,7 +14839,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -14847,7 +14847,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -14855,7 +14855,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -14865,7 +14865,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -14873,7 +14873,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -14881,7 +14881,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -14889,7 +14889,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -14911,7 +14911,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14919,7 +14919,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -14927,7 +14927,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14935,7 +14935,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -14945,7 +14945,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14953,7 +14953,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -14961,7 +14961,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -14969,7 +14969,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -14982,7 +14982,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -14990,7 +14990,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -14998,7 +14998,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15006,7 +15006,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15016,7 +15016,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15024,7 +15024,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -15032,7 +15032,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15040,7 +15040,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15056,7 +15056,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15064,7 +15064,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -15072,7 +15072,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15080,7 +15080,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -15090,7 +15090,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15098,7 +15098,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -15106,7 +15106,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15114,7 +15114,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -15127,7 +15127,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15135,7 +15135,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -15143,7 +15143,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15151,7 +15151,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15161,7 +15161,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15169,7 +15169,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -15177,7 +15177,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15185,7 +15185,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15204,7 +15204,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15212,7 +15212,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -15220,7 +15220,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15228,7 +15228,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -15238,7 +15238,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15246,7 +15246,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -15254,7 +15254,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15262,7 +15262,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -15275,7 +15275,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -15283,7 +15283,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -15291,7 +15291,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -15299,7 +15299,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -15309,7 +15309,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -15317,7 +15317,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -15325,7 +15325,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -15333,7 +15333,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -15349,7 +15349,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15357,7 +15357,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -15365,7 +15365,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15373,7 +15373,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -15383,7 +15383,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15391,7 +15391,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -15399,7 +15399,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15407,7 +15407,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -15420,7 +15420,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -15428,7 +15428,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -15436,7 +15436,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -15444,7 +15444,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -15454,7 +15454,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -15462,7 +15462,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -15470,7 +15470,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -15478,7 +15478,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -15500,7 +15500,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15508,7 +15508,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -15516,7 +15516,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15524,7 +15524,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -15534,7 +15534,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15542,7 +15542,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -15550,7 +15550,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15558,7 +15558,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -15571,7 +15571,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15579,7 +15579,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -15587,7 +15587,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15595,7 +15595,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15605,7 +15605,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15613,7 +15613,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -15621,7 +15621,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15629,7 +15629,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15645,7 +15645,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15653,7 +15653,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -15661,7 +15661,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15669,7 +15669,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -15679,7 +15679,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15687,7 +15687,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -15695,7 +15695,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -15703,7 +15703,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -15716,7 +15716,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15724,7 +15724,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -15732,7 +15732,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15740,7 +15740,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -15750,7 +15750,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15758,7 +15758,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -15766,7 +15766,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15774,7 +15774,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -15793,7 +15793,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15801,7 +15801,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -15809,7 +15809,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15817,7 +15817,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -15827,7 +15827,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15835,7 +15835,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -15843,7 +15843,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15851,7 +15851,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -15864,7 +15864,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -15872,7 +15872,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -15880,7 +15880,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -15888,7 +15888,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -15898,7 +15898,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -15906,7 +15906,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -15914,7 +15914,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -15922,7 +15922,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -15938,7 +15938,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15946,7 +15946,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -15954,7 +15954,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15962,7 +15962,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -15972,7 +15972,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15980,7 +15980,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -15988,7 +15988,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -15996,7 +15996,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -16009,7 +16009,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -16017,7 +16017,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -16025,7 +16025,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -16033,7 +16033,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -16043,7 +16043,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -16051,7 +16051,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -16059,7 +16059,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -16067,7 +16067,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -16090,7 +16090,7 @@
 void test8()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -16112,7 +16112,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16120,7 +16120,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -16128,7 +16128,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16136,7 +16136,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16146,7 +16146,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16154,7 +16154,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -16162,7 +16162,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16170,7 +16170,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16183,7 +16183,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16191,7 +16191,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -16199,7 +16199,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16207,7 +16207,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16217,7 +16217,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16225,7 +16225,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -16233,7 +16233,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16241,7 +16241,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16257,7 +16257,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16265,7 +16265,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -16273,7 +16273,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16281,7 +16281,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16291,7 +16291,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16299,7 +16299,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -16307,7 +16307,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16315,7 +16315,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16328,7 +16328,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16336,7 +16336,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -16344,7 +16344,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16352,7 +16352,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16362,7 +16362,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16370,7 +16370,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -16378,7 +16378,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16386,7 +16386,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16405,7 +16405,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16413,7 +16413,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -16421,7 +16421,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16429,7 +16429,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16439,7 +16439,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16447,7 +16447,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -16455,7 +16455,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16463,7 +16463,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16476,7 +16476,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16484,7 +16484,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -16492,7 +16492,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16500,7 +16500,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16510,7 +16510,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16518,7 +16518,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -16526,7 +16526,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16534,7 +16534,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16550,7 +16550,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16558,7 +16558,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -16566,7 +16566,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16574,7 +16574,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16584,7 +16584,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16592,7 +16592,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -16600,7 +16600,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16608,7 +16608,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16621,7 +16621,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16629,7 +16629,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -16637,7 +16637,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16645,7 +16645,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16655,7 +16655,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16663,7 +16663,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -16671,7 +16671,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16679,7 +16679,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -16701,7 +16701,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16709,7 +16709,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -16717,7 +16717,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16725,7 +16725,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16735,7 +16735,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16743,7 +16743,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -16751,7 +16751,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16759,7 +16759,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16772,7 +16772,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16780,7 +16780,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -16788,7 +16788,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16796,7 +16796,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16806,7 +16806,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16814,7 +16814,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -16822,7 +16822,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16830,7 +16830,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16846,7 +16846,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16854,7 +16854,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -16862,7 +16862,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16870,7 +16870,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16880,7 +16880,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16888,7 +16888,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -16896,7 +16896,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16904,7 +16904,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16917,7 +16917,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16925,7 +16925,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -16933,7 +16933,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16941,7 +16941,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16951,7 +16951,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16959,7 +16959,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -16967,7 +16967,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16975,7 +16975,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -16994,7 +16994,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17002,7 +17002,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -17010,7 +17010,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17018,7 +17018,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17028,7 +17028,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17036,7 +17036,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -17044,7 +17044,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17052,7 +17052,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17065,7 +17065,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17073,7 +17073,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -17081,7 +17081,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17089,7 +17089,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17099,7 +17099,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17107,7 +17107,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -17115,7 +17115,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17123,7 +17123,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17139,7 +17139,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17147,7 +17147,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -17155,7 +17155,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17163,7 +17163,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17173,7 +17173,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17181,7 +17181,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -17189,7 +17189,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17197,7 +17197,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17210,7 +17210,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17218,7 +17218,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -17226,7 +17226,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17234,7 +17234,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17244,7 +17244,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17252,7 +17252,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -17260,7 +17260,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17268,7 +17268,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17296,7 +17296,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17304,7 +17304,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -17312,7 +17312,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17320,7 +17320,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17330,7 +17330,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17338,7 +17338,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -17346,7 +17346,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17354,7 +17354,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17367,7 +17367,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17375,7 +17375,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1.26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -17383,7 +17383,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17391,7 +17391,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17401,7 +17401,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17409,7 +17409,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x1;26580b488p+30********");
                                     assert(ios.width() == 0);
@@ -17417,7 +17417,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17425,7 +17425,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x********1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17441,7 +17441,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17449,7 +17449,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -17457,7 +17457,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17465,7 +17465,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17475,7 +17475,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17483,7 +17483,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -17491,7 +17491,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17499,7 +17499,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17512,7 +17512,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17520,7 +17520,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1.26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -17528,7 +17528,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17536,7 +17536,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1.26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17546,7 +17546,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17554,7 +17554,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x1;26580b488p+30*******");
                                     assert(ios.width() == 0);
@@ -17562,7 +17562,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17570,7 +17570,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0x1;26580b488p+30");
                                     assert(ios.width() == 0);
@@ -17589,7 +17589,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17597,7 +17597,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -17605,7 +17605,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17613,7 +17613,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17623,7 +17623,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17631,7 +17631,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -17639,7 +17639,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17647,7 +17647,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17660,7 +17660,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17668,7 +17668,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1.26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -17676,7 +17676,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17684,7 +17684,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17694,7 +17694,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17702,7 +17702,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X1;26580B488P+30********");
                                     assert(ios.width() == 0);
@@ -17710,7 +17710,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17718,7 +17718,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X********1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17734,7 +17734,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17742,7 +17742,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -17750,7 +17750,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17758,7 +17758,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17768,7 +17768,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17776,7 +17776,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -17784,7 +17784,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17792,7 +17792,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17805,7 +17805,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17813,7 +17813,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1.26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -17821,7 +17821,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17829,7 +17829,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1.26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17839,7 +17839,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17847,7 +17847,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X1;26580B488P+30*******");
                                     assert(ios.width() == 0);
@@ -17855,7 +17855,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0X1;26580B488P+30");
                                     assert(ios.width() == 0);
@@ -17863,7 +17863,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0X1;26580B488P+30");
                                     assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long.pass.cpp
@@ -19,7 +19,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::num_put<char, output_iterator<char*> > F;
+typedef std::num_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -47,7 +47,7 @@
         std::ios ios(0);
         long v = 0;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0");
     }
@@ -55,7 +55,7 @@
         std::ios ios(0);
         long v = 1;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1");
     }
@@ -63,7 +63,7 @@
         std::ios ios(0);
         long v = -1;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1");
     }
@@ -71,7 +71,7 @@
         std::ios ios(0);
         long v = -1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1000");
     }
@@ -79,7 +79,7 @@
         std::ios ios(0);
         long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1000");
     }
@@ -88,7 +88,7 @@
         showpos(ios);
         long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "+1000");
     }
@@ -97,7 +97,7 @@
         oct(ios);
         long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1750");
     }
@@ -107,7 +107,7 @@
         showbase(ios);
         long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "01750");
     }
@@ -116,7 +116,7 @@
         hex(ios);
         long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "3e8");
     }
@@ -126,7 +126,7 @@
         showbase(ios);
         long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x3e8");
     }
@@ -137,7 +137,7 @@
         uppercase(ios);
         long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0X3E8");
     }
@@ -149,7 +149,7 @@
         uppercase(ios);
         long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0X3E_8");
     }
@@ -160,7 +160,7 @@
         showbase(ios);
         long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x7f_fff_ff_f");
     }
@@ -170,7 +170,7 @@
         oct(ios);
         long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "123_46_7");
     }
@@ -181,7 +181,7 @@
         showbase(ios);
         long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0_123_46_7");
     }
@@ -194,7 +194,7 @@
         ios.width(15);
         long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "*****0_123_46_7");
     }
@@ -207,7 +207,7 @@
         ios.width(15);
         long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0_123_46_7*****");
     }
@@ -220,7 +220,7 @@
         ios.width(15);
         long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "*****0_123_46_7");
         assert(ios.width() == 0);
@@ -234,7 +234,7 @@
         ios.width(15);
         long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "**0x7f_fff_ff_f");
     }
@@ -247,7 +247,7 @@
         ios.width(15);
         long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x7f_fff_ff_f**");
     }
@@ -260,7 +260,7 @@
         ios.width(15);
         long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x**7f_fff_ff_f");
         assert(ios.width() == 0);
@@ -273,7 +273,7 @@
         right(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "***+1_00_0");
         assert(ios.width() == 0);
@@ -286,7 +286,7 @@
         left(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "+1_00_0***");
         assert(ios.width() == 0);
@@ -299,7 +299,7 @@
         internal(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "+***1_00_0");
         assert(ios.width() == 0);
@@ -312,7 +312,7 @@
         showpos(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "***-1_00_0");
         assert(ios.width() == 0);
@@ -324,7 +324,7 @@
         left(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1_00_0***");
         assert(ios.width() == 0);
@@ -336,7 +336,7 @@
         internal(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-***1_00_0");
         assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp
@@ -26,7 +26,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::num_put<char, output_iterator<char*> > F;
+typedef std::num_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -51,7 +51,7 @@
 void test1()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -72,7 +72,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -80,7 +80,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -88,7 +88,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -96,7 +96,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -106,7 +106,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -114,7 +114,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -122,7 +122,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -130,7 +130,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -143,7 +143,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -151,7 +151,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -159,7 +159,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -167,7 +167,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -177,7 +177,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -185,7 +185,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -193,7 +193,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -201,7 +201,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -217,7 +217,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -225,7 +225,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -233,7 +233,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -241,7 +241,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -251,7 +251,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -259,7 +259,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -267,7 +267,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -275,7 +275,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -288,7 +288,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -296,7 +296,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -304,7 +304,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -312,7 +312,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -322,7 +322,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -330,7 +330,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -338,7 +338,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -346,7 +346,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -365,7 +365,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -373,7 +373,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -381,7 +381,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -389,7 +389,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -399,7 +399,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -407,7 +407,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -415,7 +415,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -423,7 +423,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -436,7 +436,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -444,7 +444,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -452,7 +452,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -460,7 +460,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -470,7 +470,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -478,7 +478,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -486,7 +486,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -494,7 +494,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -510,7 +510,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -518,7 +518,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -526,7 +526,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -534,7 +534,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -544,7 +544,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -552,7 +552,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -560,7 +560,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -568,7 +568,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -581,7 +581,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -589,7 +589,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -597,7 +597,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -605,7 +605,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -615,7 +615,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -623,7 +623,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -631,7 +631,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -639,7 +639,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -661,7 +661,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -669,7 +669,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -677,7 +677,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -685,7 +685,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -695,7 +695,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -703,7 +703,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -711,7 +711,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -719,7 +719,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -732,7 +732,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -740,7 +740,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -748,7 +748,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -756,7 +756,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -766,7 +766,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -774,7 +774,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -782,7 +782,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -790,7 +790,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -806,7 +806,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -814,7 +814,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -822,7 +822,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -830,7 +830,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -840,7 +840,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -848,7 +848,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -856,7 +856,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -864,7 +864,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -877,7 +877,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -885,7 +885,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -893,7 +893,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -901,7 +901,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -911,7 +911,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -919,7 +919,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -927,7 +927,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -935,7 +935,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -954,7 +954,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -962,7 +962,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -970,7 +970,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -978,7 +978,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -988,7 +988,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -996,7 +996,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1004,7 +1004,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1012,7 +1012,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1025,7 +1025,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -1033,7 +1033,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -1041,7 +1041,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -1049,7 +1049,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -1059,7 +1059,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -1067,7 +1067,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -1075,7 +1075,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -1083,7 +1083,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -1099,7 +1099,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1107,7 +1107,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1115,7 +1115,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1123,7 +1123,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1133,7 +1133,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1141,7 +1141,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1149,7 +1149,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1157,7 +1157,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1170,7 +1170,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -1178,7 +1178,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -1186,7 +1186,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -1194,7 +1194,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -1204,7 +1204,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -1212,7 +1212,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -1220,7 +1220,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -1228,7 +1228,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -1250,7 +1250,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1258,7 +1258,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1266,7 +1266,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1274,7 +1274,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1284,7 +1284,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1292,7 +1292,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1300,7 +1300,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1308,7 +1308,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1321,7 +1321,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000");
                                     assert(ios.width() == 0);
@@ -1329,7 +1329,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000******************");
                                     assert(ios.width() == 0);
@@ -1337,7 +1337,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0.00000");
                                     assert(ios.width() == 0);
@@ -1345,7 +1345,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0.00000");
                                     assert(ios.width() == 0);
@@ -1355,7 +1355,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000");
                                     assert(ios.width() == 0);
@@ -1363,7 +1363,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000******************");
                                     assert(ios.width() == 0);
@@ -1371,7 +1371,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0;00000");
                                     assert(ios.width() == 0);
@@ -1379,7 +1379,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0;00000");
                                     assert(ios.width() == 0);
@@ -1395,7 +1395,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1403,7 +1403,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1411,7 +1411,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1419,7 +1419,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1429,7 +1429,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1437,7 +1437,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1445,7 +1445,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1453,7 +1453,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1466,7 +1466,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000");
                                     assert(ios.width() == 0);
@@ -1474,7 +1474,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000*****************");
                                     assert(ios.width() == 0);
@@ -1482,7 +1482,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+0.00000");
                                     assert(ios.width() == 0);
@@ -1490,7 +1490,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************0.00000");
                                     assert(ios.width() == 0);
@@ -1500,7 +1500,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000");
                                     assert(ios.width() == 0);
@@ -1508,7 +1508,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000*****************");
                                     assert(ios.width() == 0);
@@ -1516,7 +1516,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+0;00000");
                                     assert(ios.width() == 0);
@@ -1524,7 +1524,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************0;00000");
                                     assert(ios.width() == 0);
@@ -1543,7 +1543,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1551,7 +1551,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1559,7 +1559,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1567,7 +1567,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1577,7 +1577,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1585,7 +1585,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1593,7 +1593,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1601,7 +1601,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1614,7 +1614,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000");
                                     assert(ios.width() == 0);
@@ -1622,7 +1622,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000******************");
                                     assert(ios.width() == 0);
@@ -1630,7 +1630,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0.00000");
                                     assert(ios.width() == 0);
@@ -1638,7 +1638,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0.00000");
                                     assert(ios.width() == 0);
@@ -1648,7 +1648,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000");
                                     assert(ios.width() == 0);
@@ -1656,7 +1656,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000******************");
                                     assert(ios.width() == 0);
@@ -1664,7 +1664,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0;00000");
                                     assert(ios.width() == 0);
@@ -1672,7 +1672,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************0;00000");
                                     assert(ios.width() == 0);
@@ -1688,7 +1688,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1696,7 +1696,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1704,7 +1704,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1712,7 +1712,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1722,7 +1722,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1730,7 +1730,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -1738,7 +1738,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -1746,7 +1746,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -1759,7 +1759,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000");
                                     assert(ios.width() == 0);
@@ -1767,7 +1767,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000*****************");
                                     assert(ios.width() == 0);
@@ -1775,7 +1775,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+0.00000");
                                     assert(ios.width() == 0);
@@ -1783,7 +1783,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************0.00000");
                                     assert(ios.width() == 0);
@@ -1793,7 +1793,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000");
                                     assert(ios.width() == 0);
@@ -1801,7 +1801,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000*****************");
                                     assert(ios.width() == 0);
@@ -1809,7 +1809,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+0;00000");
                                     assert(ios.width() == 0);
@@ -1817,7 +1817,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************0;00000");
                                     assert(ios.width() == 0);
@@ -1839,7 +1839,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1847,7 +1847,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1855,7 +1855,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1863,7 +1863,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1873,7 +1873,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -1881,7 +1881,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -1889,7 +1889,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1897,7 +1897,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -1910,7 +1910,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000");
                                     assert(ios.width() == 0);
@@ -1918,7 +1918,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000********");
                                     assert(ios.width() == 0);
@@ -1926,7 +1926,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0.000000000000000");
                                     assert(ios.width() == 0);
@@ -1934,7 +1934,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0.000000000000000");
                                     assert(ios.width() == 0);
@@ -1944,7 +1944,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000");
                                     assert(ios.width() == 0);
@@ -1952,7 +1952,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000********");
                                     assert(ios.width() == 0);
@@ -1960,7 +1960,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0;000000000000000");
                                     assert(ios.width() == 0);
@@ -1968,7 +1968,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0;000000000000000");
                                     assert(ios.width() == 0);
@@ -1984,7 +1984,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -1992,7 +1992,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2000,7 +2000,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2008,7 +2008,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2018,7 +2018,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2026,7 +2026,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2034,7 +2034,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2042,7 +2042,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2055,7 +2055,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2063,7 +2063,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000*******");
                                     assert(ios.width() == 0);
@@ -2071,7 +2071,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2079,7 +2079,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2089,7 +2089,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2097,7 +2097,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000*******");
                                     assert(ios.width() == 0);
@@ -2105,7 +2105,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2113,7 +2113,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2132,7 +2132,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2140,7 +2140,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2148,7 +2148,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2156,7 +2156,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2166,7 +2166,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2174,7 +2174,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2182,7 +2182,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2190,7 +2190,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2203,7 +2203,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2211,7 +2211,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000********");
                                     assert(ios.width() == 0);
@@ -2219,7 +2219,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2227,7 +2227,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2237,7 +2237,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2245,7 +2245,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000********");
                                     assert(ios.width() == 0);
@@ -2253,7 +2253,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2261,7 +2261,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2277,7 +2277,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2285,7 +2285,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2293,7 +2293,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2301,7 +2301,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2311,7 +2311,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2319,7 +2319,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2327,7 +2327,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2335,7 +2335,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2348,7 +2348,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2356,7 +2356,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000*******");
                                     assert(ios.width() == 0);
@@ -2364,7 +2364,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2372,7 +2372,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0.000000000000000");
                                     assert(ios.width() == 0);
@@ -2382,7 +2382,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2390,7 +2390,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000*******");
                                     assert(ios.width() == 0);
@@ -2398,7 +2398,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2406,7 +2406,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******0;000000000000000");
                                     assert(ios.width() == 0);
@@ -2428,7 +2428,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2436,7 +2436,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2444,7 +2444,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2452,7 +2452,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2462,7 +2462,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2470,7 +2470,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2478,7 +2478,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2486,7 +2486,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2499,7 +2499,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2507,7 +2507,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2515,7 +2515,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2523,7 +2523,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2533,7 +2533,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2541,7 +2541,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2549,7 +2549,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2557,7 +2557,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2573,7 +2573,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2581,7 +2581,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2589,7 +2589,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2597,7 +2597,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2607,7 +2607,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2615,7 +2615,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2623,7 +2623,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2631,7 +2631,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2644,7 +2644,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2652,7 +2652,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2660,7 +2660,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2668,7 +2668,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2678,7 +2678,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2686,7 +2686,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2694,7 +2694,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2702,7 +2702,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2721,7 +2721,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2729,7 +2729,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2737,7 +2737,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2745,7 +2745,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2755,7 +2755,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -2763,7 +2763,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -2771,7 +2771,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2779,7 +2779,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -2792,7 +2792,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2800,7 +2800,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2808,7 +2808,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2816,7 +2816,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2826,7 +2826,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2834,7 +2834,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2842,7 +2842,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2850,7 +2850,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2866,7 +2866,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2874,7 +2874,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2882,7 +2882,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2890,7 +2890,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2900,7 +2900,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -2908,7 +2908,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -2916,7 +2916,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -2924,7 +2924,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -2937,7 +2937,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2945,7 +2945,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2953,7 +2953,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2961,7 +2961,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2971,7 +2971,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2979,7 +2979,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2987,7 +2987,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -2995,7 +2995,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -3012,7 +3012,7 @@
 void test2()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -3033,7 +3033,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3041,7 +3041,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3049,7 +3049,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3057,7 +3057,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3067,7 +3067,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3075,7 +3075,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3083,7 +3083,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3091,7 +3091,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3104,7 +3104,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -3112,7 +3112,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -3120,7 +3120,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -3128,7 +3128,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -3138,7 +3138,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -3146,7 +3146,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -3154,7 +3154,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -3162,7 +3162,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -3178,7 +3178,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3186,7 +3186,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3194,7 +3194,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3202,7 +3202,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3212,7 +3212,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3220,7 +3220,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3228,7 +3228,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3236,7 +3236,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3249,7 +3249,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -3257,7 +3257,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -3265,7 +3265,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -3273,7 +3273,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -3283,7 +3283,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -3291,7 +3291,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -3299,7 +3299,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -3307,7 +3307,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -3326,7 +3326,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3334,7 +3334,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3342,7 +3342,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3350,7 +3350,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3360,7 +3360,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3368,7 +3368,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3376,7 +3376,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3384,7 +3384,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3397,7 +3397,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -3405,7 +3405,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -3413,7 +3413,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -3421,7 +3421,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -3431,7 +3431,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -3439,7 +3439,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -3447,7 +3447,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -3455,7 +3455,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -3471,7 +3471,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3479,7 +3479,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3487,7 +3487,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3495,7 +3495,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3505,7 +3505,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3513,7 +3513,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3521,7 +3521,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3529,7 +3529,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3542,7 +3542,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -3550,7 +3550,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -3558,7 +3558,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -3566,7 +3566,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -3576,7 +3576,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -3584,7 +3584,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -3592,7 +3592,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -3600,7 +3600,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -3622,7 +3622,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3630,7 +3630,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3638,7 +3638,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3646,7 +3646,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3656,7 +3656,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3664,7 +3664,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3672,7 +3672,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3680,7 +3680,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3693,7 +3693,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -3701,7 +3701,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -3709,7 +3709,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -3717,7 +3717,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -3727,7 +3727,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -3735,7 +3735,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -3743,7 +3743,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -3751,7 +3751,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -3767,7 +3767,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3775,7 +3775,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3783,7 +3783,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3791,7 +3791,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3801,7 +3801,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3809,7 +3809,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3817,7 +3817,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3825,7 +3825,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3838,7 +3838,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -3846,7 +3846,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -3854,7 +3854,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -3862,7 +3862,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -3872,7 +3872,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -3880,7 +3880,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -3888,7 +3888,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -3896,7 +3896,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -3915,7 +3915,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3923,7 +3923,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3931,7 +3931,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3939,7 +3939,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3949,7 +3949,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -3957,7 +3957,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -3965,7 +3965,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -3973,7 +3973,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -3986,7 +3986,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -3994,7 +3994,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -4002,7 +4002,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -4010,7 +4010,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -4020,7 +4020,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -4028,7 +4028,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -4036,7 +4036,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -4044,7 +4044,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -4060,7 +4060,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4068,7 +4068,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4076,7 +4076,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4084,7 +4084,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4094,7 +4094,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4102,7 +4102,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4110,7 +4110,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4118,7 +4118,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4131,7 +4131,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -4139,7 +4139,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -4147,7 +4147,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -4155,7 +4155,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -4165,7 +4165,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -4173,7 +4173,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -4181,7 +4181,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -4189,7 +4189,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -4211,7 +4211,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4219,7 +4219,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4227,7 +4227,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4235,7 +4235,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4245,7 +4245,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4253,7 +4253,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4261,7 +4261,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4269,7 +4269,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4282,7 +4282,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000");
                                     assert(ios.width() == 0);
@@ -4290,7 +4290,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000*****************");
                                     assert(ios.width() == 0);
@@ -4298,7 +4298,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.00000");
                                     assert(ios.width() == 0);
@@ -4306,7 +4306,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.00000");
                                     assert(ios.width() == 0);
@@ -4316,7 +4316,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000");
                                     assert(ios.width() == 0);
@@ -4324,7 +4324,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000*****************");
                                     assert(ios.width() == 0);
@@ -4332,7 +4332,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;00000");
                                     assert(ios.width() == 0);
@@ -4340,7 +4340,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;00000");
                                     assert(ios.width() == 0);
@@ -4356,7 +4356,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4364,7 +4364,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4372,7 +4372,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4380,7 +4380,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4390,7 +4390,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4398,7 +4398,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4406,7 +4406,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4414,7 +4414,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4427,7 +4427,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000");
                                     assert(ios.width() == 0);
@@ -4435,7 +4435,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000*****************");
                                     assert(ios.width() == 0);
@@ -4443,7 +4443,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.00000");
                                     assert(ios.width() == 0);
@@ -4451,7 +4451,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.00000");
                                     assert(ios.width() == 0);
@@ -4461,7 +4461,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000");
                                     assert(ios.width() == 0);
@@ -4469,7 +4469,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000*****************");
                                     assert(ios.width() == 0);
@@ -4477,7 +4477,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;00000");
                                     assert(ios.width() == 0);
@@ -4485,7 +4485,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;00000");
                                     assert(ios.width() == 0);
@@ -4504,7 +4504,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4512,7 +4512,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4520,7 +4520,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4528,7 +4528,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4538,7 +4538,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4546,7 +4546,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4554,7 +4554,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4562,7 +4562,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4575,7 +4575,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000");
                                     assert(ios.width() == 0);
@@ -4583,7 +4583,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000*****************");
                                     assert(ios.width() == 0);
@@ -4591,7 +4591,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.00000");
                                     assert(ios.width() == 0);
@@ -4599,7 +4599,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.00000");
                                     assert(ios.width() == 0);
@@ -4609,7 +4609,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000");
                                     assert(ios.width() == 0);
@@ -4617,7 +4617,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000*****************");
                                     assert(ios.width() == 0);
@@ -4625,7 +4625,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;00000");
                                     assert(ios.width() == 0);
@@ -4633,7 +4633,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;00000");
                                     assert(ios.width() == 0);
@@ -4649,7 +4649,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4657,7 +4657,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4665,7 +4665,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4673,7 +4673,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4683,7 +4683,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4691,7 +4691,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4699,7 +4699,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4707,7 +4707,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4720,7 +4720,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000");
                                     assert(ios.width() == 0);
@@ -4728,7 +4728,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000*****************");
                                     assert(ios.width() == 0);
@@ -4736,7 +4736,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.00000");
                                     assert(ios.width() == 0);
@@ -4744,7 +4744,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.00000");
                                     assert(ios.width() == 0);
@@ -4754,7 +4754,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000");
                                     assert(ios.width() == 0);
@@ -4762,7 +4762,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000*****************");
                                     assert(ios.width() == 0);
@@ -4770,7 +4770,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;00000");
                                     assert(ios.width() == 0);
@@ -4778,7 +4778,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;00000");
                                     assert(ios.width() == 0);
@@ -4800,7 +4800,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4808,7 +4808,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4816,7 +4816,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4824,7 +4824,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4834,7 +4834,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4842,7 +4842,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4850,7 +4850,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4858,7 +4858,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4871,7 +4871,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000");
                                     assert(ios.width() == 0);
@@ -4879,7 +4879,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000*******");
                                     assert(ios.width() == 0);
@@ -4887,7 +4887,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******-0.000000000000000");
                                     assert(ios.width() == 0);
@@ -4895,7 +4895,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******0.000000000000000");
                                     assert(ios.width() == 0);
@@ -4905,7 +4905,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000");
                                     assert(ios.width() == 0);
@@ -4913,7 +4913,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000*******");
                                     assert(ios.width() == 0);
@@ -4921,7 +4921,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******-0;000000000000000");
                                     assert(ios.width() == 0);
@@ -4929,7 +4929,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******0;000000000000000");
                                     assert(ios.width() == 0);
@@ -4945,7 +4945,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4953,7 +4953,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4961,7 +4961,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -4969,7 +4969,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -4979,7 +4979,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -4987,7 +4987,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -4995,7 +4995,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5003,7 +5003,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5016,7 +5016,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000");
                                     assert(ios.width() == 0);
@@ -5024,7 +5024,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000*******");
                                     assert(ios.width() == 0);
@@ -5032,7 +5032,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******-0.000000000000000");
                                     assert(ios.width() == 0);
@@ -5040,7 +5040,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******0.000000000000000");
                                     assert(ios.width() == 0);
@@ -5050,7 +5050,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000");
                                     assert(ios.width() == 0);
@@ -5058,7 +5058,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000*******");
                                     assert(ios.width() == 0);
@@ -5066,7 +5066,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******-0;000000000000000");
                                     assert(ios.width() == 0);
@@ -5074,7 +5074,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******0;000000000000000");
                                     assert(ios.width() == 0);
@@ -5093,7 +5093,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5101,7 +5101,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5109,7 +5109,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5117,7 +5117,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5127,7 +5127,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5135,7 +5135,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5143,7 +5143,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5151,7 +5151,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5164,7 +5164,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000");
                                     assert(ios.width() == 0);
@@ -5172,7 +5172,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000*******");
                                     assert(ios.width() == 0);
@@ -5180,7 +5180,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******-0.000000000000000");
                                     assert(ios.width() == 0);
@@ -5188,7 +5188,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******0.000000000000000");
                                     assert(ios.width() == 0);
@@ -5198,7 +5198,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000");
                                     assert(ios.width() == 0);
@@ -5206,7 +5206,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000*******");
                                     assert(ios.width() == 0);
@@ -5214,7 +5214,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******-0;000000000000000");
                                     assert(ios.width() == 0);
@@ -5222,7 +5222,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******0;000000000000000");
                                     assert(ios.width() == 0);
@@ -5238,7 +5238,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5246,7 +5246,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5254,7 +5254,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5262,7 +5262,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5272,7 +5272,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5280,7 +5280,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5288,7 +5288,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5296,7 +5296,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5309,7 +5309,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000");
                                     assert(ios.width() == 0);
@@ -5317,7 +5317,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000*******");
                                     assert(ios.width() == 0);
@@ -5325,7 +5325,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******-0.000000000000000");
                                     assert(ios.width() == 0);
@@ -5333,7 +5333,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******0.000000000000000");
                                     assert(ios.width() == 0);
@@ -5343,7 +5343,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000");
                                     assert(ios.width() == 0);
@@ -5351,7 +5351,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000*******");
                                     assert(ios.width() == 0);
@@ -5359,7 +5359,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******-0;000000000000000");
                                     assert(ios.width() == 0);
@@ -5367,7 +5367,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******0;000000000000000");
                                     assert(ios.width() == 0);
@@ -5389,7 +5389,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5397,7 +5397,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5405,7 +5405,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5413,7 +5413,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5423,7 +5423,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5431,7 +5431,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5439,7 +5439,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5447,7 +5447,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5460,7 +5460,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5468,7 +5468,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5476,7 +5476,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5484,7 +5484,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5494,7 +5494,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5502,7 +5502,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5510,7 +5510,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5518,7 +5518,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5534,7 +5534,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5542,7 +5542,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5550,7 +5550,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5558,7 +5558,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5568,7 +5568,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5576,7 +5576,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5584,7 +5584,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5592,7 +5592,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5605,7 +5605,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5613,7 +5613,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5621,7 +5621,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5629,7 +5629,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5639,7 +5639,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5647,7 +5647,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5655,7 +5655,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5663,7 +5663,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5682,7 +5682,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5690,7 +5690,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5698,7 +5698,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5706,7 +5706,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5716,7 +5716,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5724,7 +5724,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5732,7 +5732,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5740,7 +5740,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5753,7 +5753,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5761,7 +5761,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5769,7 +5769,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5777,7 +5777,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5787,7 +5787,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5795,7 +5795,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5803,7 +5803,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5811,7 +5811,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5827,7 +5827,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5835,7 +5835,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5843,7 +5843,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5851,7 +5851,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5861,7 +5861,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -5869,7 +5869,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -5877,7 +5877,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -5885,7 +5885,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -5898,7 +5898,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5906,7 +5906,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5914,7 +5914,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5922,7 +5922,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5932,7 +5932,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5940,7 +5940,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5948,7 +5948,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5956,7 +5956,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;00000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -5973,7 +5973,7 @@
 void test3()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -5994,7 +5994,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -6002,7 +6002,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -6010,7 +6010,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -6018,7 +6018,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -6028,7 +6028,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -6036,7 +6036,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -6044,7 +6044,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -6052,7 +6052,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -6065,7 +6065,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09");
                                     assert(ios.width() == 0);
@@ -6073,7 +6073,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09*******************");
                                     assert(ios.width() == 0);
@@ -6081,7 +6081,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -6089,7 +6089,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -6099,7 +6099,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09");
                                     assert(ios.width() == 0);
@@ -6107,7 +6107,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09*******************");
                                     assert(ios.width() == 0);
@@ -6115,7 +6115,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -6123,7 +6123,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -6139,7 +6139,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -6147,7 +6147,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -6155,7 +6155,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -6163,7 +6163,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -6173,7 +6173,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -6181,7 +6181,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -6189,7 +6189,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -6197,7 +6197,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -6210,7 +6210,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09");
                                     assert(ios.width() == 0);
@@ -6218,7 +6218,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09******************");
                                     assert(ios.width() == 0);
@@ -6226,7 +6226,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.e+09");
                                     assert(ios.width() == 0);
@@ -6234,7 +6234,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.e+09");
                                     assert(ios.width() == 0);
@@ -6244,7 +6244,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09");
                                     assert(ios.width() == 0);
@@ -6252,7 +6252,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09******************");
                                     assert(ios.width() == 0);
@@ -6260,7 +6260,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;e+09");
                                     assert(ios.width() == 0);
@@ -6268,7 +6268,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;e+09");
                                     assert(ios.width() == 0);
@@ -6287,7 +6287,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -6295,7 +6295,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -6303,7 +6303,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -6311,7 +6311,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -6321,7 +6321,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -6329,7 +6329,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -6337,7 +6337,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -6345,7 +6345,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -6358,7 +6358,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09");
                                     assert(ios.width() == 0);
@@ -6366,7 +6366,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09*******************");
                                     assert(ios.width() == 0);
@@ -6374,7 +6374,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -6382,7 +6382,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -6392,7 +6392,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09");
                                     assert(ios.width() == 0);
@@ -6400,7 +6400,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09*******************");
                                     assert(ios.width() == 0);
@@ -6408,7 +6408,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -6416,7 +6416,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -6432,7 +6432,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -6440,7 +6440,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -6448,7 +6448,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -6456,7 +6456,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -6466,7 +6466,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -6474,7 +6474,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -6482,7 +6482,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -6490,7 +6490,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -6503,7 +6503,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09");
                                     assert(ios.width() == 0);
@@ -6511,7 +6511,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09******************");
                                     assert(ios.width() == 0);
@@ -6519,7 +6519,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.E+09");
                                     assert(ios.width() == 0);
@@ -6527,7 +6527,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.E+09");
                                     assert(ios.width() == 0);
@@ -6537,7 +6537,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09");
                                     assert(ios.width() == 0);
@@ -6545,7 +6545,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09******************");
                                     assert(ios.width() == 0);
@@ -6553,7 +6553,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;E+09");
                                     assert(ios.width() == 0);
@@ -6561,7 +6561,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;E+09");
                                     assert(ios.width() == 0);
@@ -6583,7 +6583,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -6591,7 +6591,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -6599,7 +6599,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -6607,7 +6607,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -6617,7 +6617,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -6625,7 +6625,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -6633,7 +6633,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -6641,7 +6641,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -6654,7 +6654,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09");
                                     assert(ios.width() == 0);
@@ -6662,7 +6662,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09*******************");
                                     assert(ios.width() == 0);
@@ -6670,7 +6670,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -6678,7 +6678,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -6688,7 +6688,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09");
                                     assert(ios.width() == 0);
@@ -6696,7 +6696,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09*******************");
                                     assert(ios.width() == 0);
@@ -6704,7 +6704,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -6712,7 +6712,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -6728,7 +6728,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -6736,7 +6736,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -6744,7 +6744,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -6752,7 +6752,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -6762,7 +6762,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -6770,7 +6770,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -6778,7 +6778,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -6786,7 +6786,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -6799,7 +6799,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09");
                                     assert(ios.width() == 0);
@@ -6807,7 +6807,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09******************");
                                     assert(ios.width() == 0);
@@ -6815,7 +6815,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.e+09");
                                     assert(ios.width() == 0);
@@ -6823,7 +6823,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.e+09");
                                     assert(ios.width() == 0);
@@ -6833,7 +6833,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09");
                                     assert(ios.width() == 0);
@@ -6841,7 +6841,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09******************");
                                     assert(ios.width() == 0);
@@ -6849,7 +6849,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;e+09");
                                     assert(ios.width() == 0);
@@ -6857,7 +6857,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;e+09");
                                     assert(ios.width() == 0);
@@ -6876,7 +6876,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -6884,7 +6884,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -6892,7 +6892,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -6900,7 +6900,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -6910,7 +6910,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -6918,7 +6918,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -6926,7 +6926,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -6934,7 +6934,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -6947,7 +6947,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09");
                                     assert(ios.width() == 0);
@@ -6955,7 +6955,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09*******************");
                                     assert(ios.width() == 0);
@@ -6963,7 +6963,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -6971,7 +6971,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -6981,7 +6981,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09");
                                     assert(ios.width() == 0);
@@ -6989,7 +6989,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09*******************");
                                     assert(ios.width() == 0);
@@ -6997,7 +6997,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -7005,7 +7005,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -7021,7 +7021,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -7029,7 +7029,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -7037,7 +7037,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -7045,7 +7045,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -7055,7 +7055,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -7063,7 +7063,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -7071,7 +7071,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -7079,7 +7079,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -7092,7 +7092,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09");
                                     assert(ios.width() == 0);
@@ -7100,7 +7100,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09******************");
                                     assert(ios.width() == 0);
@@ -7108,7 +7108,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.E+09");
                                     assert(ios.width() == 0);
@@ -7116,7 +7116,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.E+09");
                                     assert(ios.width() == 0);
@@ -7126,7 +7126,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09");
                                     assert(ios.width() == 0);
@@ -7134,7 +7134,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09******************");
                                     assert(ios.width() == 0);
@@ -7142,7 +7142,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;E+09");
                                     assert(ios.width() == 0);
@@ -7150,7 +7150,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;E+09");
                                     assert(ios.width() == 0);
@@ -7172,7 +7172,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7180,7 +7180,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457e+09**************");
                                     assert(ios.width() == 0);
@@ -7188,7 +7188,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7196,7 +7196,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7206,7 +7206,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7214,7 +7214,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457e+09**************");
                                     assert(ios.width() == 0);
@@ -7222,7 +7222,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7230,7 +7230,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7243,7 +7243,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7251,7 +7251,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457e+09**************");
                                     assert(ios.width() == 0);
@@ -7259,7 +7259,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7267,7 +7267,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7277,7 +7277,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7285,7 +7285,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457e+09**************");
                                     assert(ios.width() == 0);
@@ -7293,7 +7293,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7301,7 +7301,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7317,7 +7317,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7325,7 +7325,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457e+09*************");
                                     assert(ios.width() == 0);
@@ -7333,7 +7333,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7341,7 +7341,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7351,7 +7351,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7359,7 +7359,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457e+09*************");
                                     assert(ios.width() == 0);
@@ -7367,7 +7367,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7375,7 +7375,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7388,7 +7388,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7396,7 +7396,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457e+09*************");
                                     assert(ios.width() == 0);
@@ -7404,7 +7404,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7412,7 +7412,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1.23457e+09");
                                     assert(ios.width() == 0);
@@ -7422,7 +7422,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7430,7 +7430,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457e+09*************");
                                     assert(ios.width() == 0);
@@ -7438,7 +7438,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7446,7 +7446,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1;23457e+09");
                                     assert(ios.width() == 0);
@@ -7465,7 +7465,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7473,7 +7473,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457E+09**************");
                                     assert(ios.width() == 0);
@@ -7481,7 +7481,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7489,7 +7489,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7499,7 +7499,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7507,7 +7507,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457E+09**************");
                                     assert(ios.width() == 0);
@@ -7515,7 +7515,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7523,7 +7523,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7536,7 +7536,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7544,7 +7544,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.23457E+09**************");
                                     assert(ios.width() == 0);
@@ -7552,7 +7552,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7560,7 +7560,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7570,7 +7570,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7578,7 +7578,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;23457E+09**************");
                                     assert(ios.width() == 0);
@@ -7586,7 +7586,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7594,7 +7594,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7610,7 +7610,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7618,7 +7618,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457E+09*************");
                                     assert(ios.width() == 0);
@@ -7626,7 +7626,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7634,7 +7634,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7644,7 +7644,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7652,7 +7652,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457E+09*************");
                                     assert(ios.width() == 0);
@@ -7660,7 +7660,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7668,7 +7668,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7681,7 +7681,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7689,7 +7689,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.23457E+09*************");
                                     assert(ios.width() == 0);
@@ -7697,7 +7697,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7705,7 +7705,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1.23457E+09");
                                     assert(ios.width() == 0);
@@ -7715,7 +7715,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7723,7 +7723,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;23457E+09*************");
                                     assert(ios.width() == 0);
@@ -7731,7 +7731,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7739,7 +7739,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1;23457E+09");
                                     assert(ios.width() == 0);
@@ -7761,7 +7761,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125");
                                     assert(ios.width() == 0);
@@ -7769,7 +7769,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125***********");
                                     assert(ios.width() == 0);
@@ -7777,7 +7777,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -7785,7 +7785,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -7795,7 +7795,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -7803,7 +7803,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125*******");
                                     assert(ios.width() == 0);
@@ -7811,7 +7811,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -7819,7 +7819,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -7832,7 +7832,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -7840,7 +7840,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -7848,7 +7848,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -7856,7 +7856,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -7866,7 +7866,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -7874,7 +7874,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -7882,7 +7882,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -7890,7 +7890,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -7906,7 +7906,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125");
                                     assert(ios.width() == 0);
@@ -7914,7 +7914,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125**********");
                                     assert(ios.width() == 0);
@@ -7922,7 +7922,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1234567890.125");
                                     assert(ios.width() == 0);
@@ -7930,7 +7930,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1234567890.125");
                                     assert(ios.width() == 0);
@@ -7940,7 +7940,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -7948,7 +7948,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125******");
                                     assert(ios.width() == 0);
@@ -7956,7 +7956,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -7964,7 +7964,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -7977,7 +7977,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -7985,7 +7985,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -7993,7 +7993,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -8001,7 +8001,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -8011,7 +8011,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -8019,7 +8019,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -8027,7 +8027,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -8035,7 +8035,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -8054,7 +8054,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125");
                                     assert(ios.width() == 0);
@@ -8062,7 +8062,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125***********");
                                     assert(ios.width() == 0);
@@ -8070,7 +8070,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -8078,7 +8078,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -8088,7 +8088,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8096,7 +8096,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125*******");
                                     assert(ios.width() == 0);
@@ -8104,7 +8104,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8112,7 +8112,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8125,7 +8125,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -8133,7 +8133,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -8141,7 +8141,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -8149,7 +8149,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -8159,7 +8159,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -8167,7 +8167,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -8175,7 +8175,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -8183,7 +8183,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -8199,7 +8199,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125");
                                     assert(ios.width() == 0);
@@ -8207,7 +8207,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125**********");
                                     assert(ios.width() == 0);
@@ -8215,7 +8215,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1234567890.125");
                                     assert(ios.width() == 0);
@@ -8223,7 +8223,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1234567890.125");
                                     assert(ios.width() == 0);
@@ -8233,7 +8233,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8241,7 +8241,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125******");
                                     assert(ios.width() == 0);
@@ -8249,7 +8249,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8257,7 +8257,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8270,7 +8270,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -8278,7 +8278,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -8286,7 +8286,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -8294,7 +8294,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -8304,7 +8304,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -8312,7 +8312,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -8320,7 +8320,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -8328,7 +8328,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -8350,7 +8350,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125");
                                     assert(ios.width() == 0);
@@ -8358,7 +8358,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125***********");
                                     assert(ios.width() == 0);
@@ -8366,7 +8366,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -8374,7 +8374,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -8384,7 +8384,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8392,7 +8392,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125*******");
                                     assert(ios.width() == 0);
@@ -8400,7 +8400,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8408,7 +8408,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8421,7 +8421,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8429,7 +8429,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8437,7 +8437,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8445,7 +8445,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8455,7 +8455,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8463,7 +8463,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8471,7 +8471,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8479,7 +8479,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8495,7 +8495,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125");
                                     assert(ios.width() == 0);
@@ -8503,7 +8503,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125**********");
                                     assert(ios.width() == 0);
@@ -8511,7 +8511,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1234567890.125");
                                     assert(ios.width() == 0);
@@ -8519,7 +8519,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1234567890.125");
                                     assert(ios.width() == 0);
@@ -8529,7 +8529,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8537,7 +8537,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125******");
                                     assert(ios.width() == 0);
@@ -8545,7 +8545,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8553,7 +8553,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8566,7 +8566,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8574,7 +8574,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8582,7 +8582,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8590,7 +8590,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8600,7 +8600,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8608,7 +8608,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8616,7 +8616,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8624,7 +8624,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8643,7 +8643,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125");
                                     assert(ios.width() == 0);
@@ -8651,7 +8651,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125***********");
                                     assert(ios.width() == 0);
@@ -8659,7 +8659,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -8667,7 +8667,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1234567890.125");
                                     assert(ios.width() == 0);
@@ -8677,7 +8677,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8685,7 +8685,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125*******");
                                     assert(ios.width() == 0);
@@ -8693,7 +8693,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8701,7 +8701,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8714,7 +8714,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8722,7 +8722,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8730,7 +8730,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8738,7 +8738,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8748,7 +8748,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8756,7 +8756,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8764,7 +8764,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8772,7 +8772,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8788,7 +8788,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125");
                                     assert(ios.width() == 0);
@@ -8796,7 +8796,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125**********");
                                     assert(ios.width() == 0);
@@ -8804,7 +8804,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1234567890.125");
                                     assert(ios.width() == 0);
@@ -8812,7 +8812,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1234567890.125");
                                     assert(ios.width() == 0);
@@ -8822,7 +8822,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8830,7 +8830,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125******");
                                     assert(ios.width() == 0);
@@ -8838,7 +8838,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8846,7 +8846,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******1_234_567_89_0;125");
                                     assert(ios.width() == 0);
@@ -8859,7 +8859,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8867,7 +8867,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8875,7 +8875,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8883,7 +8883,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8893,7 +8893,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8901,7 +8901,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8909,7 +8909,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8917,7 +8917,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;12500000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -8934,7 +8934,7 @@
 void test4()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -8955,7 +8955,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -8963,7 +8963,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -8971,7 +8971,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -8979,7 +8979,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -8989,7 +8989,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -8997,7 +8997,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9005,7 +9005,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9013,7 +9013,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9026,7 +9026,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9034,7 +9034,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9042,7 +9042,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9050,7 +9050,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9060,7 +9060,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9068,7 +9068,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9076,7 +9076,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9084,7 +9084,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9100,7 +9100,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9108,7 +9108,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9116,7 +9116,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9124,7 +9124,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9134,7 +9134,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9142,7 +9142,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9150,7 +9150,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9158,7 +9158,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9171,7 +9171,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9179,7 +9179,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9187,7 +9187,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9195,7 +9195,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9205,7 +9205,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9213,7 +9213,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9221,7 +9221,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9229,7 +9229,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9248,7 +9248,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9256,7 +9256,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9264,7 +9264,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9272,7 +9272,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9282,7 +9282,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9290,7 +9290,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9298,7 +9298,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9306,7 +9306,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9319,7 +9319,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9327,7 +9327,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9335,7 +9335,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9343,7 +9343,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9353,7 +9353,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9361,7 +9361,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9369,7 +9369,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9377,7 +9377,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9393,7 +9393,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9401,7 +9401,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9409,7 +9409,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9417,7 +9417,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9427,7 +9427,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9435,7 +9435,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9443,7 +9443,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9451,7 +9451,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9464,7 +9464,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9472,7 +9472,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9480,7 +9480,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9488,7 +9488,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9498,7 +9498,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9506,7 +9506,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9514,7 +9514,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9522,7 +9522,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9544,7 +9544,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9552,7 +9552,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9560,7 +9560,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9568,7 +9568,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9578,7 +9578,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9586,7 +9586,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9594,7 +9594,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9602,7 +9602,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9615,7 +9615,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9623,7 +9623,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9631,7 +9631,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9639,7 +9639,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9649,7 +9649,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9657,7 +9657,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9665,7 +9665,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9673,7 +9673,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9689,7 +9689,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9697,7 +9697,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9705,7 +9705,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9713,7 +9713,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9723,7 +9723,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9731,7 +9731,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9739,7 +9739,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9747,7 +9747,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9760,7 +9760,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9768,7 +9768,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9776,7 +9776,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9784,7 +9784,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9794,7 +9794,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -9802,7 +9802,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -9810,7 +9810,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -9818,7 +9818,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -9837,7 +9837,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9845,7 +9845,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9853,7 +9853,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9861,7 +9861,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9871,7 +9871,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9879,7 +9879,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9887,7 +9887,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9895,7 +9895,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9908,7 +9908,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9916,7 +9916,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9924,7 +9924,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9932,7 +9932,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9942,7 +9942,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9950,7 +9950,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9958,7 +9958,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -9966,7 +9966,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -9982,7 +9982,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -9990,7 +9990,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -9998,7 +9998,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10006,7 +10006,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10016,7 +10016,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10024,7 +10024,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10032,7 +10032,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10040,7 +10040,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10053,7 +10053,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10061,7 +10061,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10069,7 +10069,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10077,7 +10077,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10087,7 +10087,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10095,7 +10095,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10103,7 +10103,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10111,7 +10111,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10133,7 +10133,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -10141,7 +10141,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -10149,7 +10149,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -10157,7 +10157,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -10167,7 +10167,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -10175,7 +10175,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -10183,7 +10183,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -10191,7 +10191,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -10204,7 +10204,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -10212,7 +10212,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -10220,7 +10220,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -10228,7 +10228,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -10238,7 +10238,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -10246,7 +10246,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -10254,7 +10254,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -10262,7 +10262,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -10278,7 +10278,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -10286,7 +10286,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -10294,7 +10294,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -10302,7 +10302,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -10312,7 +10312,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -10320,7 +10320,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -10328,7 +10328,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -10336,7 +10336,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -10349,7 +10349,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -10357,7 +10357,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -10365,7 +10365,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -10373,7 +10373,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -10383,7 +10383,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf");
                                     assert(ios.width() == 0);
@@ -10391,7 +10391,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-inf*********************");
                                     assert(ios.width() == 0);
@@ -10399,7 +10399,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-inf");
                                     assert(ios.width() == 0);
@@ -10407,7 +10407,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************inf");
                                     assert(ios.width() == 0);
@@ -10426,7 +10426,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10434,7 +10434,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10442,7 +10442,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10450,7 +10450,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10460,7 +10460,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10468,7 +10468,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10476,7 +10476,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10484,7 +10484,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10497,7 +10497,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10505,7 +10505,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10513,7 +10513,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10521,7 +10521,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10531,7 +10531,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10539,7 +10539,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10547,7 +10547,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10555,7 +10555,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10571,7 +10571,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10579,7 +10579,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10587,7 +10587,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10595,7 +10595,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10605,7 +10605,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10613,7 +10613,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10621,7 +10621,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10629,7 +10629,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10642,7 +10642,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10650,7 +10650,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10658,7 +10658,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10666,7 +10666,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10676,7 +10676,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF");
                                     assert(ios.width() == 0);
@@ -10684,7 +10684,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-INF*********************");
                                     assert(ios.width() == 0);
@@ -10692,7 +10692,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-INF");
                                     assert(ios.width() == 0);
@@ -10700,7 +10700,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************INF");
                                     assert(ios.width() == 0);
@@ -10721,7 +10721,7 @@
 void test5()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -10742,7 +10742,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan");
                                     assert(ios.width() == 0);
@@ -10750,7 +10750,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan**********************");
                                     assert(ios.width() == 0);
@@ -10758,7 +10758,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10766,7 +10766,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10776,7 +10776,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan");
                                     assert(ios.width() == 0);
@@ -10784,7 +10784,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan**********************");
                                     assert(ios.width() == 0);
@@ -10792,7 +10792,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10800,7 +10800,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10813,7 +10813,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan");
                                     assert(ios.width() == 0);
@@ -10821,7 +10821,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan**********************");
                                     assert(ios.width() == 0);
@@ -10829,7 +10829,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10837,7 +10837,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10847,7 +10847,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan");
                                     assert(ios.width() == 0);
@@ -10855,7 +10855,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan**********************");
                                     assert(ios.width() == 0);
@@ -10863,7 +10863,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10871,7 +10871,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10887,7 +10887,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan");
                                     assert(ios.width() == 0);
@@ -10895,7 +10895,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan**********************");
                                     assert(ios.width() == 0);
@@ -10903,7 +10903,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10911,7 +10911,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10921,7 +10921,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan");
                                     assert(ios.width() == 0);
@@ -10929,7 +10929,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan**********************");
                                     assert(ios.width() == 0);
@@ -10937,7 +10937,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10945,7 +10945,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10958,7 +10958,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan");
                                     assert(ios.width() == 0);
@@ -10966,7 +10966,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan**********************");
                                     assert(ios.width() == 0);
@@ -10974,7 +10974,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10982,7 +10982,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -10992,7 +10992,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan");
                                     assert(ios.width() == 0);
@@ -11000,7 +11000,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "nan**********************");
                                     assert(ios.width() == 0);
@@ -11008,7 +11008,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -11016,7 +11016,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************nan");
                                     assert(ios.width() == 0);
@@ -11035,7 +11035,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN");
                                     assert(ios.width() == 0);
@@ -11043,7 +11043,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN**********************");
                                     assert(ios.width() == 0);
@@ -11051,7 +11051,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11059,7 +11059,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11069,7 +11069,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN");
                                     assert(ios.width() == 0);
@@ -11077,7 +11077,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN**********************");
                                     assert(ios.width() == 0);
@@ -11085,7 +11085,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11093,7 +11093,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11106,7 +11106,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN");
                                     assert(ios.width() == 0);
@@ -11114,7 +11114,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN**********************");
                                     assert(ios.width() == 0);
@@ -11122,7 +11122,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11130,7 +11130,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11140,7 +11140,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN");
                                     assert(ios.width() == 0);
@@ -11148,7 +11148,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN**********************");
                                     assert(ios.width() == 0);
@@ -11156,7 +11156,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11164,7 +11164,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11180,7 +11180,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN");
                                     assert(ios.width() == 0);
@@ -11188,7 +11188,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN**********************");
                                     assert(ios.width() == 0);
@@ -11196,7 +11196,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11204,7 +11204,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11214,7 +11214,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN");
                                     assert(ios.width() == 0);
@@ -11222,7 +11222,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN**********************");
                                     assert(ios.width() == 0);
@@ -11230,7 +11230,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11238,7 +11238,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11251,7 +11251,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN");
                                     assert(ios.width() == 0);
@@ -11259,7 +11259,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN**********************");
                                     assert(ios.width() == 0);
@@ -11267,7 +11267,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11275,7 +11275,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11285,7 +11285,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN");
                                     assert(ios.width() == 0);
@@ -11293,7 +11293,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "NAN**********************");
                                     assert(ios.width() == 0);
@@ -11301,7 +11301,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11309,7 +11309,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************NAN");
                                     assert(ios.width() == 0);
@@ -11334,7 +11334,7 @@
 void test6()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -11356,7 +11356,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -11364,7 +11364,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -11372,7 +11372,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -11380,7 +11380,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -11390,7 +11390,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -11398,7 +11398,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -11406,7 +11406,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -11414,7 +11414,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -11427,7 +11427,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -11435,7 +11435,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -11443,7 +11443,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -11451,7 +11451,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -11461,7 +11461,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -11469,7 +11469,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -11477,7 +11477,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -11485,7 +11485,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -11501,7 +11501,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -11509,7 +11509,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -11517,7 +11517,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -11525,7 +11525,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -11535,7 +11535,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -11543,7 +11543,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -11551,7 +11551,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -11559,7 +11559,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -11572,7 +11572,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -11580,7 +11580,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -11588,7 +11588,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -11596,7 +11596,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -11606,7 +11606,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -11614,7 +11614,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -11622,7 +11622,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -11630,7 +11630,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -11649,7 +11649,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -11657,7 +11657,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -11665,7 +11665,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -11673,7 +11673,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -11683,7 +11683,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0");
                                     assert(ios.width() == 0);
@@ -11691,7 +11691,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0************************");
                                     assert(ios.width() == 0);
@@ -11699,7 +11699,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -11707,7 +11707,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************************0");
                                     assert(ios.width() == 0);
@@ -11720,7 +11720,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.");
                                     assert(ios.width() == 0);
@@ -11728,7 +11728,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.***********************");
                                     assert(ios.width() == 0);
@@ -11736,7 +11736,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -11744,7 +11744,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0.");
                                     assert(ios.width() == 0);
@@ -11754,7 +11754,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;");
                                     assert(ios.width() == 0);
@@ -11762,7 +11762,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;***********************");
                                     assert(ios.width() == 0);
@@ -11770,7 +11770,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -11778,7 +11778,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************0;");
                                     assert(ios.width() == 0);
@@ -11794,7 +11794,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -11802,7 +11802,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -11810,7 +11810,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -11818,7 +11818,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -11828,7 +11828,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0");
                                     assert(ios.width() == 0);
@@ -11836,7 +11836,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0***********************");
                                     assert(ios.width() == 0);
@@ -11844,7 +11844,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************+0");
                                     assert(ios.width() == 0);
@@ -11852,7 +11852,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***********************0");
                                     assert(ios.width() == 0);
@@ -11865,7 +11865,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.");
                                     assert(ios.width() == 0);
@@ -11873,7 +11873,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.**********************");
                                     assert(ios.width() == 0);
@@ -11881,7 +11881,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0.");
                                     assert(ios.width() == 0);
@@ -11889,7 +11889,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0.");
                                     assert(ios.width() == 0);
@@ -11899,7 +11899,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;");
                                     assert(ios.width() == 0);
@@ -11907,7 +11907,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;**********************");
                                     assert(ios.width() == 0);
@@ -11915,7 +11915,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************+0;");
                                     assert(ios.width() == 0);
@@ -11923,7 +11923,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********************0;");
                                     assert(ios.width() == 0);
@@ -11945,7 +11945,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0");
                                     assert(ios.width() == 0);
@@ -11953,7 +11953,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0**********************");
                                     assert(ios.width() == 0);
@@ -11961,7 +11961,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -11969,7 +11969,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -11979,7 +11979,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0");
                                     assert(ios.width() == 0);
@@ -11987,7 +11987,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0**********************");
                                     assert(ios.width() == 0);
@@ -11995,7 +11995,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -12003,7 +12003,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -12016,7 +12016,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0");
                                     assert(ios.width() == 0);
@@ -12024,7 +12024,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0**********************");
                                     assert(ios.width() == 0);
@@ -12032,7 +12032,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -12040,7 +12040,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -12050,7 +12050,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0");
                                     assert(ios.width() == 0);
@@ -12058,7 +12058,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0**********************");
                                     assert(ios.width() == 0);
@@ -12066,7 +12066,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -12074,7 +12074,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -12090,7 +12090,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0");
                                     assert(ios.width() == 0);
@@ -12098,7 +12098,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0*********************");
                                     assert(ios.width() == 0);
@@ -12106,7 +12106,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0.0");
                                     assert(ios.width() == 0);
@@ -12114,7 +12114,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0.0");
                                     assert(ios.width() == 0);
@@ -12124,7 +12124,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0");
                                     assert(ios.width() == 0);
@@ -12132,7 +12132,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0*********************");
                                     assert(ios.width() == 0);
@@ -12140,7 +12140,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0;0");
                                     assert(ios.width() == 0);
@@ -12148,7 +12148,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0;0");
                                     assert(ios.width() == 0);
@@ -12161,7 +12161,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0");
                                     assert(ios.width() == 0);
@@ -12169,7 +12169,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0*********************");
                                     assert(ios.width() == 0);
@@ -12177,7 +12177,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0.0");
                                     assert(ios.width() == 0);
@@ -12185,7 +12185,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0.0");
                                     assert(ios.width() == 0);
@@ -12195,7 +12195,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0");
                                     assert(ios.width() == 0);
@@ -12203,7 +12203,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0*********************");
                                     assert(ios.width() == 0);
@@ -12211,7 +12211,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0;0");
                                     assert(ios.width() == 0);
@@ -12219,7 +12219,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0;0");
                                     assert(ios.width() == 0);
@@ -12238,7 +12238,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0");
                                     assert(ios.width() == 0);
@@ -12246,7 +12246,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0**********************");
                                     assert(ios.width() == 0);
@@ -12254,7 +12254,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -12262,7 +12262,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -12272,7 +12272,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0");
                                     assert(ios.width() == 0);
@@ -12280,7 +12280,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0**********************");
                                     assert(ios.width() == 0);
@@ -12288,7 +12288,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -12296,7 +12296,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -12309,7 +12309,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0");
                                     assert(ios.width() == 0);
@@ -12317,7 +12317,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0**********************");
                                     assert(ios.width() == 0);
@@ -12325,7 +12325,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -12333,7 +12333,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0.0");
                                     assert(ios.width() == 0);
@@ -12343,7 +12343,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0");
                                     assert(ios.width() == 0);
@@ -12351,7 +12351,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0**********************");
                                     assert(ios.width() == 0);
@@ -12359,7 +12359,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -12367,7 +12367,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************0;0");
                                     assert(ios.width() == 0);
@@ -12383,7 +12383,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0");
                                     assert(ios.width() == 0);
@@ -12391,7 +12391,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0*********************");
                                     assert(ios.width() == 0);
@@ -12399,7 +12399,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0.0");
                                     assert(ios.width() == 0);
@@ -12407,7 +12407,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0.0");
                                     assert(ios.width() == 0);
@@ -12417,7 +12417,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0");
                                     assert(ios.width() == 0);
@@ -12425,7 +12425,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0*********************");
                                     assert(ios.width() == 0);
@@ -12433,7 +12433,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0;0");
                                     assert(ios.width() == 0);
@@ -12441,7 +12441,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0;0");
                                     assert(ios.width() == 0);
@@ -12454,7 +12454,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0");
                                     assert(ios.width() == 0);
@@ -12462,7 +12462,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0*********************");
                                     assert(ios.width() == 0);
@@ -12470,7 +12470,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0.0");
                                     assert(ios.width() == 0);
@@ -12478,7 +12478,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0.0");
                                     assert(ios.width() == 0);
@@ -12488,7 +12488,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0");
                                     assert(ios.width() == 0);
@@ -12496,7 +12496,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0*********************");
                                     assert(ios.width() == 0);
@@ -12504,7 +12504,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************+0;0");
                                     assert(ios.width() == 0);
@@ -12512,7 +12512,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********************0;0");
                                     assert(ios.width() == 0);
@@ -12534,7 +12534,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000");
                                     assert(ios.width() == 0);
@@ -12542,7 +12542,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000*****************");
                                     assert(ios.width() == 0);
@@ -12550,7 +12550,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -12558,7 +12558,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -12568,7 +12568,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000");
                                     assert(ios.width() == 0);
@@ -12576,7 +12576,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000*****************");
                                     assert(ios.width() == 0);
@@ -12584,7 +12584,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -12592,7 +12592,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -12605,7 +12605,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000");
                                     assert(ios.width() == 0);
@@ -12613,7 +12613,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000*****************");
                                     assert(ios.width() == 0);
@@ -12621,7 +12621,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -12629,7 +12629,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -12639,7 +12639,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000");
                                     assert(ios.width() == 0);
@@ -12647,7 +12647,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000*****************");
                                     assert(ios.width() == 0);
@@ -12655,7 +12655,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -12663,7 +12663,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -12679,7 +12679,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000");
                                     assert(ios.width() == 0);
@@ -12687,7 +12687,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000****************");
                                     assert(ios.width() == 0);
@@ -12695,7 +12695,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0.000000");
                                     assert(ios.width() == 0);
@@ -12703,7 +12703,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0.000000");
                                     assert(ios.width() == 0);
@@ -12713,7 +12713,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000");
                                     assert(ios.width() == 0);
@@ -12721,7 +12721,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000****************");
                                     assert(ios.width() == 0);
@@ -12729,7 +12729,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0;000000");
                                     assert(ios.width() == 0);
@@ -12737,7 +12737,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0;000000");
                                     assert(ios.width() == 0);
@@ -12750,7 +12750,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000");
                                     assert(ios.width() == 0);
@@ -12758,7 +12758,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000****************");
                                     assert(ios.width() == 0);
@@ -12766,7 +12766,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0.000000");
                                     assert(ios.width() == 0);
@@ -12774,7 +12774,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0.000000");
                                     assert(ios.width() == 0);
@@ -12784,7 +12784,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000");
                                     assert(ios.width() == 0);
@@ -12792,7 +12792,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000****************");
                                     assert(ios.width() == 0);
@@ -12800,7 +12800,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0;000000");
                                     assert(ios.width() == 0);
@@ -12808,7 +12808,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0;000000");
                                     assert(ios.width() == 0);
@@ -12827,7 +12827,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000");
                                     assert(ios.width() == 0);
@@ -12835,7 +12835,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000*****************");
                                     assert(ios.width() == 0);
@@ -12843,7 +12843,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -12851,7 +12851,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -12861,7 +12861,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000");
                                     assert(ios.width() == 0);
@@ -12869,7 +12869,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000*****************");
                                     assert(ios.width() == 0);
@@ -12877,7 +12877,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -12885,7 +12885,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -12898,7 +12898,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000");
                                     assert(ios.width() == 0);
@@ -12906,7 +12906,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000*****************");
                                     assert(ios.width() == 0);
@@ -12914,7 +12914,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -12922,7 +12922,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0.000000");
                                     assert(ios.width() == 0);
@@ -12932,7 +12932,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000");
                                     assert(ios.width() == 0);
@@ -12940,7 +12940,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000*****************");
                                     assert(ios.width() == 0);
@@ -12948,7 +12948,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -12956,7 +12956,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************0;000000");
                                     assert(ios.width() == 0);
@@ -12972,7 +12972,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000");
                                     assert(ios.width() == 0);
@@ -12980,7 +12980,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000****************");
                                     assert(ios.width() == 0);
@@ -12988,7 +12988,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0.000000");
                                     assert(ios.width() == 0);
@@ -12996,7 +12996,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0.000000");
                                     assert(ios.width() == 0);
@@ -13006,7 +13006,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000");
                                     assert(ios.width() == 0);
@@ -13014,7 +13014,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000****************");
                                     assert(ios.width() == 0);
@@ -13022,7 +13022,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0;000000");
                                     assert(ios.width() == 0);
@@ -13030,7 +13030,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0;000000");
                                     assert(ios.width() == 0);
@@ -13043,7 +13043,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000");
                                     assert(ios.width() == 0);
@@ -13051,7 +13051,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000****************");
                                     assert(ios.width() == 0);
@@ -13059,7 +13059,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0.000000");
                                     assert(ios.width() == 0);
@@ -13067,7 +13067,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0.000000");
                                     assert(ios.width() == 0);
@@ -13077,7 +13077,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000");
                                     assert(ios.width() == 0);
@@ -13085,7 +13085,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000****************");
                                     assert(ios.width() == 0);
@@ -13093,7 +13093,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************+0;000000");
                                     assert(ios.width() == 0);
@@ -13101,7 +13101,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+****************0;000000");
                                     assert(ios.width() == 0);
@@ -13123,7 +13123,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13131,7 +13131,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -13139,7 +13139,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13147,7 +13147,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13157,7 +13157,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13165,7 +13165,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -13173,7 +13173,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13181,7 +13181,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13194,7 +13194,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13202,7 +13202,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -13210,7 +13210,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13218,7 +13218,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13228,7 +13228,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13236,7 +13236,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -13244,7 +13244,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13252,7 +13252,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13268,7 +13268,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13276,7 +13276,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -13284,7 +13284,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13292,7 +13292,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13302,7 +13302,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13310,7 +13310,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -13318,7 +13318,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13326,7 +13326,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13339,7 +13339,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13347,7 +13347,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -13355,7 +13355,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13363,7 +13363,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13373,7 +13373,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13381,7 +13381,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -13389,7 +13389,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13397,7 +13397,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13416,7 +13416,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13424,7 +13424,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -13432,7 +13432,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13440,7 +13440,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13450,7 +13450,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13458,7 +13458,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -13466,7 +13466,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13474,7 +13474,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13487,7 +13487,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13495,7 +13495,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -13503,7 +13503,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13511,7 +13511,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13521,7 +13521,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13529,7 +13529,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;0000000000000000*******");
                                     assert(ios.width() == 0);
@@ -13537,7 +13537,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13545,7 +13545,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13561,7 +13561,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13569,7 +13569,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -13577,7 +13577,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13585,7 +13585,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13595,7 +13595,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13603,7 +13603,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -13611,7 +13611,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13619,7 +13619,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13632,7 +13632,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13640,7 +13640,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -13648,7 +13648,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13656,7 +13656,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -13666,7 +13666,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13674,7 +13674,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -13682,7 +13682,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******+0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13690,7 +13690,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -13712,7 +13712,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13720,7 +13720,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13728,7 +13728,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13736,7 +13736,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13746,7 +13746,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13754,7 +13754,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13762,7 +13762,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13770,7 +13770,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13783,7 +13783,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13791,7 +13791,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13799,7 +13799,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13807,7 +13807,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13817,7 +13817,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13825,7 +13825,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13833,7 +13833,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13841,7 +13841,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13857,7 +13857,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13865,7 +13865,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13873,7 +13873,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13881,7 +13881,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13891,7 +13891,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13899,7 +13899,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13907,7 +13907,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13915,7 +13915,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13928,7 +13928,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13936,7 +13936,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13944,7 +13944,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13952,7 +13952,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13962,7 +13962,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13970,7 +13970,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13978,7 +13978,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -13986,7 +13986,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14005,7 +14005,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14013,7 +14013,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14021,7 +14021,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14029,7 +14029,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14039,7 +14039,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14047,7 +14047,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14055,7 +14055,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14063,7 +14063,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14076,7 +14076,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14084,7 +14084,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14092,7 +14092,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14100,7 +14100,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14110,7 +14110,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14118,7 +14118,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14126,7 +14126,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14134,7 +14134,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14150,7 +14150,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14158,7 +14158,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14166,7 +14166,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14174,7 +14174,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14184,7 +14184,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14192,7 +14192,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14200,7 +14200,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14208,7 +14208,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14221,7 +14221,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14229,7 +14229,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14237,7 +14237,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14245,7 +14245,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14255,7 +14255,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14263,7 +14263,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14271,7 +14271,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14279,7 +14279,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -14296,7 +14296,7 @@
 void test7()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -14318,7 +14318,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -14326,7 +14326,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -14334,7 +14334,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -14342,7 +14342,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -14352,7 +14352,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -14360,7 +14360,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -14368,7 +14368,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -14376,7 +14376,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -14389,7 +14389,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -14397,7 +14397,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -14405,7 +14405,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -14413,7 +14413,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -14423,7 +14423,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -14431,7 +14431,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -14439,7 +14439,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -14447,7 +14447,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -14463,7 +14463,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -14471,7 +14471,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -14479,7 +14479,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -14487,7 +14487,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -14497,7 +14497,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -14505,7 +14505,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -14513,7 +14513,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -14521,7 +14521,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -14534,7 +14534,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -14542,7 +14542,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -14550,7 +14550,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -14558,7 +14558,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -14568,7 +14568,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -14576,7 +14576,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -14584,7 +14584,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -14592,7 +14592,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -14611,7 +14611,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -14619,7 +14619,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -14627,7 +14627,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -14635,7 +14635,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -14645,7 +14645,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -14653,7 +14653,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -14661,7 +14661,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -14669,7 +14669,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -14682,7 +14682,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -14690,7 +14690,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -14698,7 +14698,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -14706,7 +14706,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -14716,7 +14716,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -14724,7 +14724,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -14732,7 +14732,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -14740,7 +14740,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -14756,7 +14756,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -14764,7 +14764,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -14772,7 +14772,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -14780,7 +14780,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -14790,7 +14790,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0");
                                     assert(ios.width() == 0);
@@ -14798,7 +14798,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0***********************");
                                     assert(ios.width() == 0);
@@ -14806,7 +14806,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********************-0");
                                     assert(ios.width() == 0);
@@ -14814,7 +14814,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-***********************0");
                                     assert(ios.width() == 0);
@@ -14827,7 +14827,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.");
                                     assert(ios.width() == 0);
@@ -14835,7 +14835,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.**********************");
                                     assert(ios.width() == 0);
@@ -14843,7 +14843,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0.");
                                     assert(ios.width() == 0);
@@ -14851,7 +14851,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0.");
                                     assert(ios.width() == 0);
@@ -14861,7 +14861,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;");
                                     assert(ios.width() == 0);
@@ -14869,7 +14869,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;**********************");
                                     assert(ios.width() == 0);
@@ -14877,7 +14877,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********************-0;");
                                     assert(ios.width() == 0);
@@ -14885,7 +14885,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-**********************0;");
                                     assert(ios.width() == 0);
@@ -14907,7 +14907,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0");
                                     assert(ios.width() == 0);
@@ -14915,7 +14915,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0*********************");
                                     assert(ios.width() == 0);
@@ -14923,7 +14923,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0.0");
                                     assert(ios.width() == 0);
@@ -14931,7 +14931,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0.0");
                                     assert(ios.width() == 0);
@@ -14941,7 +14941,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0");
                                     assert(ios.width() == 0);
@@ -14949,7 +14949,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0*********************");
                                     assert(ios.width() == 0);
@@ -14957,7 +14957,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0;0");
                                     assert(ios.width() == 0);
@@ -14965,7 +14965,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0;0");
                                     assert(ios.width() == 0);
@@ -14978,7 +14978,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0");
                                     assert(ios.width() == 0);
@@ -14986,7 +14986,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0*********************");
                                     assert(ios.width() == 0);
@@ -14994,7 +14994,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0.0");
                                     assert(ios.width() == 0);
@@ -15002,7 +15002,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0.0");
                                     assert(ios.width() == 0);
@@ -15012,7 +15012,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0");
                                     assert(ios.width() == 0);
@@ -15020,7 +15020,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0*********************");
                                     assert(ios.width() == 0);
@@ -15028,7 +15028,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0;0");
                                     assert(ios.width() == 0);
@@ -15036,7 +15036,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0;0");
                                     assert(ios.width() == 0);
@@ -15052,7 +15052,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0");
                                     assert(ios.width() == 0);
@@ -15060,7 +15060,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0*********************");
                                     assert(ios.width() == 0);
@@ -15068,7 +15068,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0.0");
                                     assert(ios.width() == 0);
@@ -15076,7 +15076,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0.0");
                                     assert(ios.width() == 0);
@@ -15086,7 +15086,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0");
                                     assert(ios.width() == 0);
@@ -15094,7 +15094,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0*********************");
                                     assert(ios.width() == 0);
@@ -15102,7 +15102,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0;0");
                                     assert(ios.width() == 0);
@@ -15110,7 +15110,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0;0");
                                     assert(ios.width() == 0);
@@ -15123,7 +15123,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0");
                                     assert(ios.width() == 0);
@@ -15131,7 +15131,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0*********************");
                                     assert(ios.width() == 0);
@@ -15139,7 +15139,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0.0");
                                     assert(ios.width() == 0);
@@ -15147,7 +15147,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0.0");
                                     assert(ios.width() == 0);
@@ -15157,7 +15157,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0");
                                     assert(ios.width() == 0);
@@ -15165,7 +15165,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0*********************");
                                     assert(ios.width() == 0);
@@ -15173,7 +15173,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0;0");
                                     assert(ios.width() == 0);
@@ -15181,7 +15181,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0;0");
                                     assert(ios.width() == 0);
@@ -15200,7 +15200,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0");
                                     assert(ios.width() == 0);
@@ -15208,7 +15208,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0*********************");
                                     assert(ios.width() == 0);
@@ -15216,7 +15216,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0.0");
                                     assert(ios.width() == 0);
@@ -15224,7 +15224,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0.0");
                                     assert(ios.width() == 0);
@@ -15234,7 +15234,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0");
                                     assert(ios.width() == 0);
@@ -15242,7 +15242,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0*********************");
                                     assert(ios.width() == 0);
@@ -15250,7 +15250,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0;0");
                                     assert(ios.width() == 0);
@@ -15258,7 +15258,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0;0");
                                     assert(ios.width() == 0);
@@ -15271,7 +15271,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0");
                                     assert(ios.width() == 0);
@@ -15279,7 +15279,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0*********************");
                                     assert(ios.width() == 0);
@@ -15287,7 +15287,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0.0");
                                     assert(ios.width() == 0);
@@ -15295,7 +15295,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0.0");
                                     assert(ios.width() == 0);
@@ -15305,7 +15305,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0");
                                     assert(ios.width() == 0);
@@ -15313,7 +15313,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0*********************");
                                     assert(ios.width() == 0);
@@ -15321,7 +15321,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0;0");
                                     assert(ios.width() == 0);
@@ -15329,7 +15329,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0;0");
                                     assert(ios.width() == 0);
@@ -15345,7 +15345,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0");
                                     assert(ios.width() == 0);
@@ -15353,7 +15353,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0*********************");
                                     assert(ios.width() == 0);
@@ -15361,7 +15361,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0.0");
                                     assert(ios.width() == 0);
@@ -15369,7 +15369,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0.0");
                                     assert(ios.width() == 0);
@@ -15379,7 +15379,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0");
                                     assert(ios.width() == 0);
@@ -15387,7 +15387,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0*********************");
                                     assert(ios.width() == 0);
@@ -15395,7 +15395,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0;0");
                                     assert(ios.width() == 0);
@@ -15403,7 +15403,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0;0");
                                     assert(ios.width() == 0);
@@ -15416,7 +15416,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0");
                                     assert(ios.width() == 0);
@@ -15424,7 +15424,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0*********************");
                                     assert(ios.width() == 0);
@@ -15432,7 +15432,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0.0");
                                     assert(ios.width() == 0);
@@ -15440,7 +15440,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0.0");
                                     assert(ios.width() == 0);
@@ -15450,7 +15450,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0");
                                     assert(ios.width() == 0);
@@ -15458,7 +15458,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0*********************");
                                     assert(ios.width() == 0);
@@ -15466,7 +15466,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********************-0;0");
                                     assert(ios.width() == 0);
@@ -15474,7 +15474,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*********************0;0");
                                     assert(ios.width() == 0);
@@ -15496,7 +15496,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000");
                                     assert(ios.width() == 0);
@@ -15504,7 +15504,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000****************");
                                     assert(ios.width() == 0);
@@ -15512,7 +15512,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0.000000");
                                     assert(ios.width() == 0);
@@ -15520,7 +15520,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0.000000");
                                     assert(ios.width() == 0);
@@ -15530,7 +15530,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000");
                                     assert(ios.width() == 0);
@@ -15538,7 +15538,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000****************");
                                     assert(ios.width() == 0);
@@ -15546,7 +15546,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0;000000");
                                     assert(ios.width() == 0);
@@ -15554,7 +15554,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0;000000");
                                     assert(ios.width() == 0);
@@ -15567,7 +15567,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000");
                                     assert(ios.width() == 0);
@@ -15575,7 +15575,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000****************");
                                     assert(ios.width() == 0);
@@ -15583,7 +15583,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0.000000");
                                     assert(ios.width() == 0);
@@ -15591,7 +15591,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0.000000");
                                     assert(ios.width() == 0);
@@ -15601,7 +15601,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000");
                                     assert(ios.width() == 0);
@@ -15609,7 +15609,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000****************");
                                     assert(ios.width() == 0);
@@ -15617,7 +15617,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0;000000");
                                     assert(ios.width() == 0);
@@ -15625,7 +15625,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0;000000");
                                     assert(ios.width() == 0);
@@ -15641,7 +15641,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000");
                                     assert(ios.width() == 0);
@@ -15649,7 +15649,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000****************");
                                     assert(ios.width() == 0);
@@ -15657,7 +15657,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0.000000");
                                     assert(ios.width() == 0);
@@ -15665,7 +15665,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0.000000");
                                     assert(ios.width() == 0);
@@ -15675,7 +15675,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000");
                                     assert(ios.width() == 0);
@@ -15683,7 +15683,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000****************");
                                     assert(ios.width() == 0);
@@ -15691,7 +15691,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0;000000");
                                     assert(ios.width() == 0);
@@ -15699,7 +15699,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0;000000");
                                     assert(ios.width() == 0);
@@ -15712,7 +15712,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000");
                                     assert(ios.width() == 0);
@@ -15720,7 +15720,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000****************");
                                     assert(ios.width() == 0);
@@ -15728,7 +15728,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0.000000");
                                     assert(ios.width() == 0);
@@ -15736,7 +15736,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0.000000");
                                     assert(ios.width() == 0);
@@ -15746,7 +15746,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000");
                                     assert(ios.width() == 0);
@@ -15754,7 +15754,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000****************");
                                     assert(ios.width() == 0);
@@ -15762,7 +15762,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0;000000");
                                     assert(ios.width() == 0);
@@ -15770,7 +15770,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0;000000");
                                     assert(ios.width() == 0);
@@ -15789,7 +15789,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000");
                                     assert(ios.width() == 0);
@@ -15797,7 +15797,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000****************");
                                     assert(ios.width() == 0);
@@ -15805,7 +15805,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0.000000");
                                     assert(ios.width() == 0);
@@ -15813,7 +15813,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0.000000");
                                     assert(ios.width() == 0);
@@ -15823,7 +15823,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000");
                                     assert(ios.width() == 0);
@@ -15831,7 +15831,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000****************");
                                     assert(ios.width() == 0);
@@ -15839,7 +15839,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0;000000");
                                     assert(ios.width() == 0);
@@ -15847,7 +15847,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0;000000");
                                     assert(ios.width() == 0);
@@ -15860,7 +15860,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000");
                                     assert(ios.width() == 0);
@@ -15868,7 +15868,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000****************");
                                     assert(ios.width() == 0);
@@ -15876,7 +15876,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0.000000");
                                     assert(ios.width() == 0);
@@ -15884,7 +15884,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0.000000");
                                     assert(ios.width() == 0);
@@ -15894,7 +15894,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000");
                                     assert(ios.width() == 0);
@@ -15902,7 +15902,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000****************");
                                     assert(ios.width() == 0);
@@ -15910,7 +15910,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0;000000");
                                     assert(ios.width() == 0);
@@ -15918,7 +15918,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0;000000");
                                     assert(ios.width() == 0);
@@ -15934,7 +15934,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000");
                                     assert(ios.width() == 0);
@@ -15942,7 +15942,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000****************");
                                     assert(ios.width() == 0);
@@ -15950,7 +15950,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0.000000");
                                     assert(ios.width() == 0);
@@ -15958,7 +15958,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0.000000");
                                     assert(ios.width() == 0);
@@ -15968,7 +15968,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000");
                                     assert(ios.width() == 0);
@@ -15976,7 +15976,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000****************");
                                     assert(ios.width() == 0);
@@ -15984,7 +15984,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0;000000");
                                     assert(ios.width() == 0);
@@ -15992,7 +15992,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0;000000");
                                     assert(ios.width() == 0);
@@ -16005,7 +16005,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000");
                                     assert(ios.width() == 0);
@@ -16013,7 +16013,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000****************");
                                     assert(ios.width() == 0);
@@ -16021,7 +16021,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0.000000");
                                     assert(ios.width() == 0);
@@ -16029,7 +16029,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0.000000");
                                     assert(ios.width() == 0);
@@ -16039,7 +16039,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000");
                                     assert(ios.width() == 0);
@@ -16047,7 +16047,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000****************");
                                     assert(ios.width() == 0);
@@ -16055,7 +16055,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****************-0;000000");
                                     assert(ios.width() == 0);
@@ -16063,7 +16063,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-****************0;000000");
                                     assert(ios.width() == 0);
@@ -16085,7 +16085,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16093,7 +16093,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16101,7 +16101,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16109,7 +16109,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16119,7 +16119,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16127,7 +16127,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16135,7 +16135,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16143,7 +16143,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16156,7 +16156,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16164,7 +16164,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16172,7 +16172,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16180,7 +16180,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16190,7 +16190,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16198,7 +16198,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16206,7 +16206,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16214,7 +16214,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16230,7 +16230,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16238,7 +16238,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16246,7 +16246,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16254,7 +16254,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16264,7 +16264,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16272,7 +16272,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16280,7 +16280,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16288,7 +16288,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16301,7 +16301,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16309,7 +16309,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16317,7 +16317,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16325,7 +16325,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16335,7 +16335,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16343,7 +16343,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16351,7 +16351,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16359,7 +16359,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16378,7 +16378,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16386,7 +16386,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16394,7 +16394,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16402,7 +16402,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16412,7 +16412,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16420,7 +16420,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16428,7 +16428,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16436,7 +16436,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16449,7 +16449,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16457,7 +16457,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16465,7 +16465,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16473,7 +16473,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16483,7 +16483,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16491,7 +16491,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16499,7 +16499,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16507,7 +16507,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16523,7 +16523,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16531,7 +16531,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16539,7 +16539,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16547,7 +16547,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16557,7 +16557,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16565,7 +16565,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16573,7 +16573,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16581,7 +16581,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16594,7 +16594,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16602,7 +16602,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16610,7 +16610,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16618,7 +16618,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0.0000000000000000");
                                     assert(ios.width() == 0);
@@ -16628,7 +16628,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16636,7 +16636,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0000000000000000******");
                                     assert(ios.width() == 0);
@@ -16644,7 +16644,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******-0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16652,7 +16652,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******0;0000000000000000");
                                     assert(ios.width() == 0);
@@ -16674,7 +16674,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16682,7 +16682,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16690,7 +16690,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16698,7 +16698,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16708,7 +16708,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16716,7 +16716,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16724,7 +16724,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16732,7 +16732,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16745,7 +16745,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16753,7 +16753,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16761,7 +16761,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16769,7 +16769,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16779,7 +16779,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16787,7 +16787,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16795,7 +16795,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16803,7 +16803,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16819,7 +16819,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16827,7 +16827,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16835,7 +16835,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16843,7 +16843,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16853,7 +16853,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16861,7 +16861,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16869,7 +16869,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16877,7 +16877,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16890,7 +16890,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16898,7 +16898,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16906,7 +16906,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16914,7 +16914,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16924,7 +16924,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16932,7 +16932,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16940,7 +16940,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16948,7 +16948,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16967,7 +16967,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16975,7 +16975,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16983,7 +16983,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -16991,7 +16991,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17001,7 +17001,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17009,7 +17009,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17017,7 +17017,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17025,7 +17025,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17038,7 +17038,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17046,7 +17046,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17054,7 +17054,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17062,7 +17062,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17072,7 +17072,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17080,7 +17080,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17088,7 +17088,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17096,7 +17096,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17112,7 +17112,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17120,7 +17120,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17128,7 +17128,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17136,7 +17136,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17146,7 +17146,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17154,7 +17154,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17162,7 +17162,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17170,7 +17170,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17183,7 +17183,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17191,7 +17191,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17199,7 +17199,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17207,7 +17207,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17217,7 +17217,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17225,7 +17225,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17233,7 +17233,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17241,7 +17241,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000000000000000000000000000000000000000000000000000000000");
                                     assert(ios.width() == 0);
@@ -17258,7 +17258,7 @@
 void test8()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -17280,7 +17280,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890");
                                     assert(ios.width() == 0);
@@ -17288,7 +17288,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890***************");
                                     assert(ios.width() == 0);
@@ -17296,7 +17296,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***************1234567890");
                                     assert(ios.width() == 0);
@@ -17304,7 +17304,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***************1234567890");
                                     assert(ios.width() == 0);
@@ -17314,7 +17314,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17322,7 +17322,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0***********");
                                     assert(ios.width() == 0);
@@ -17330,7 +17330,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17338,7 +17338,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17351,7 +17351,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.");
                                     assert(ios.width() == 0);
@@ -17359,7 +17359,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.**************");
                                     assert(ios.width() == 0);
@@ -17367,7 +17367,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1234567890.");
                                     assert(ios.width() == 0);
@@ -17375,7 +17375,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1234567890.");
                                     assert(ios.width() == 0);
@@ -17385,7 +17385,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17393,7 +17393,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;**********");
                                     assert(ios.width() == 0);
@@ -17401,7 +17401,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17409,7 +17409,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17425,7 +17425,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890");
                                     assert(ios.width() == 0);
@@ -17433,7 +17433,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890**************");
                                     assert(ios.width() == 0);
@@ -17441,7 +17441,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************+1234567890");
                                     assert(ios.width() == 0);
@@ -17449,7 +17449,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**************1234567890");
                                     assert(ios.width() == 0);
@@ -17459,7 +17459,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17467,7 +17467,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0**********");
                                     assert(ios.width() == 0);
@@ -17475,7 +17475,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17483,7 +17483,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17496,7 +17496,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.");
                                     assert(ios.width() == 0);
@@ -17504,7 +17504,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.*************");
                                     assert(ios.width() == 0);
@@ -17512,7 +17512,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1234567890.");
                                     assert(ios.width() == 0);
@@ -17520,7 +17520,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1234567890.");
                                     assert(ios.width() == 0);
@@ -17530,7 +17530,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17538,7 +17538,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;*********");
                                     assert(ios.width() == 0);
@@ -17546,7 +17546,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********+1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17554,7 +17554,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17573,7 +17573,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890");
                                     assert(ios.width() == 0);
@@ -17581,7 +17581,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890***************");
                                     assert(ios.width() == 0);
@@ -17589,7 +17589,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***************1234567890");
                                     assert(ios.width() == 0);
@@ -17597,7 +17597,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***************1234567890");
                                     assert(ios.width() == 0);
@@ -17607,7 +17607,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17615,7 +17615,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0***********");
                                     assert(ios.width() == 0);
@@ -17623,7 +17623,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17631,7 +17631,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17644,7 +17644,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.");
                                     assert(ios.width() == 0);
@@ -17652,7 +17652,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.**************");
                                     assert(ios.width() == 0);
@@ -17660,7 +17660,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1234567890.");
                                     assert(ios.width() == 0);
@@ -17668,7 +17668,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************1234567890.");
                                     assert(ios.width() == 0);
@@ -17678,7 +17678,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17686,7 +17686,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;**********");
                                     assert(ios.width() == 0);
@@ -17694,7 +17694,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17702,7 +17702,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17718,7 +17718,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890");
                                     assert(ios.width() == 0);
@@ -17726,7 +17726,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890**************");
                                     assert(ios.width() == 0);
@@ -17734,7 +17734,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**************+1234567890");
                                     assert(ios.width() == 0);
@@ -17742,7 +17742,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**************1234567890");
                                     assert(ios.width() == 0);
@@ -17752,7 +17752,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17760,7 +17760,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0**********");
                                     assert(ios.width() == 0);
@@ -17768,7 +17768,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "**********+1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17776,7 +17776,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+**********1_234_567_89_0");
                                     assert(ios.width() == 0);
@@ -17789,7 +17789,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.");
                                     assert(ios.width() == 0);
@@ -17797,7 +17797,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.*************");
                                     assert(ios.width() == 0);
@@ -17805,7 +17805,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************+1234567890.");
                                     assert(ios.width() == 0);
@@ -17813,7 +17813,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*************1234567890.");
                                     assert(ios.width() == 0);
@@ -17823,7 +17823,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17831,7 +17831,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;*********");
                                     assert(ios.width() == 0);
@@ -17839,7 +17839,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********+1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17847,7 +17847,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*********1_234_567_89_0;");
                                     assert(ios.width() == 0);
@@ -17869,7 +17869,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1");
                                     assert(ios.width() == 0);
@@ -17877,7 +17877,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1*************");
                                     assert(ios.width() == 0);
@@ -17885,7 +17885,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -17893,7 +17893,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -17903,7 +17903,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -17911,7 +17911,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1*********");
                                     assert(ios.width() == 0);
@@ -17919,7 +17919,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -17927,7 +17927,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -17940,7 +17940,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1");
                                     assert(ios.width() == 0);
@@ -17948,7 +17948,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1*************");
                                     assert(ios.width() == 0);
@@ -17956,7 +17956,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -17964,7 +17964,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -17974,7 +17974,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -17982,7 +17982,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1*********");
                                     assert(ios.width() == 0);
@@ -17990,7 +17990,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -17998,7 +17998,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18014,7 +18014,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1");
                                     assert(ios.width() == 0);
@@ -18022,7 +18022,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1************");
                                     assert(ios.width() == 0);
@@ -18030,7 +18030,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************+1234567890.1");
                                     assert(ios.width() == 0);
@@ -18038,7 +18038,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+************1234567890.1");
                                     assert(ios.width() == 0);
@@ -18048,7 +18048,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18056,7 +18056,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1********");
                                     assert(ios.width() == 0);
@@ -18064,7 +18064,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18072,7 +18072,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18085,7 +18085,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1");
                                     assert(ios.width() == 0);
@@ -18093,7 +18093,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1************");
                                     assert(ios.width() == 0);
@@ -18101,7 +18101,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************+1234567890.1");
                                     assert(ios.width() == 0);
@@ -18109,7 +18109,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+************1234567890.1");
                                     assert(ios.width() == 0);
@@ -18119,7 +18119,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18127,7 +18127,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1********");
                                     assert(ios.width() == 0);
@@ -18135,7 +18135,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18143,7 +18143,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18162,7 +18162,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1");
                                     assert(ios.width() == 0);
@@ -18170,7 +18170,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1*************");
                                     assert(ios.width() == 0);
@@ -18178,7 +18178,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -18186,7 +18186,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -18196,7 +18196,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18204,7 +18204,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1*********");
                                     assert(ios.width() == 0);
@@ -18212,7 +18212,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18220,7 +18220,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18233,7 +18233,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1");
                                     assert(ios.width() == 0);
@@ -18241,7 +18241,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.1*************");
                                     assert(ios.width() == 0);
@@ -18249,7 +18249,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -18257,7 +18257,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*************1234567890.1");
                                     assert(ios.width() == 0);
@@ -18267,7 +18267,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18275,7 +18275,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;1*********");
                                     assert(ios.width() == 0);
@@ -18283,7 +18283,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18291,7 +18291,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18307,7 +18307,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1");
                                     assert(ios.width() == 0);
@@ -18315,7 +18315,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1************");
                                     assert(ios.width() == 0);
@@ -18323,7 +18323,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************+1234567890.1");
                                     assert(ios.width() == 0);
@@ -18331,7 +18331,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+************1234567890.1");
                                     assert(ios.width() == 0);
@@ -18341,7 +18341,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18349,7 +18349,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1********");
                                     assert(ios.width() == 0);
@@ -18357,7 +18357,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18365,7 +18365,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18378,7 +18378,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1");
                                     assert(ios.width() == 0);
@@ -18386,7 +18386,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.1************");
                                     assert(ios.width() == 0);
@@ -18394,7 +18394,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************+1234567890.1");
                                     assert(ios.width() == 0);
@@ -18402,7 +18402,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+************1234567890.1");
                                     assert(ios.width() == 0);
@@ -18412,7 +18412,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18420,7 +18420,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;1********");
                                     assert(ios.width() == 0);
@@ -18428,7 +18428,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18436,7 +18436,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********1_234_567_89_0;1");
                                     assert(ios.width() == 0);
@@ -18458,7 +18458,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18466,7 +18466,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -18474,7 +18474,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18482,7 +18482,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18492,7 +18492,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18500,7 +18500,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -18508,7 +18508,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18516,7 +18516,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18529,7 +18529,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18537,7 +18537,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -18545,7 +18545,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18553,7 +18553,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18563,7 +18563,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18571,7 +18571,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -18579,7 +18579,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18587,7 +18587,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18603,7 +18603,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18611,7 +18611,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -18619,7 +18619,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18627,7 +18627,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18637,7 +18637,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18645,7 +18645,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -18653,7 +18653,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18661,7 +18661,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18674,7 +18674,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18682,7 +18682,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -18690,7 +18690,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18698,7 +18698,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18708,7 +18708,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18716,7 +18716,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -18724,7 +18724,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18732,7 +18732,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18751,7 +18751,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18759,7 +18759,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -18767,7 +18767,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18775,7 +18775,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18785,7 +18785,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18793,7 +18793,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -18801,7 +18801,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18809,7 +18809,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18822,7 +18822,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18830,7 +18830,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1234567890.125000********");
                                     assert(ios.width() == 0);
@@ -18838,7 +18838,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18846,7 +18846,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18856,7 +18856,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18864,7 +18864,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1_234_567_89_0;125000****");
                                     assert(ios.width() == 0);
@@ -18872,7 +18872,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18880,7 +18880,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "****1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18896,7 +18896,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18904,7 +18904,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -18912,7 +18912,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18920,7 +18920,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18930,7 +18930,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18938,7 +18938,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -18946,7 +18946,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18954,7 +18954,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -18967,7 +18967,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18975,7 +18975,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1234567890.125000*******");
                                     assert(ios.width() == 0);
@@ -18983,7 +18983,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******+1234567890.125000");
                                     assert(ios.width() == 0);
@@ -18991,7 +18991,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******1234567890.125000");
                                     assert(ios.width() == 0);
@@ -19001,7 +19001,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -19009,7 +19009,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1_234_567_89_0;125000***");
                                     assert(ios.width() == 0);
@@ -19017,7 +19017,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "***+1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -19025,7 +19025,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+***1_234_567_89_0;125000");
                                     assert(ios.width() == 0);
@@ -19046,7 +19046,7 @@
 void test9()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -19068,7 +19068,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00");
                                     assert(ios.width() == 0);
@@ -19076,7 +19076,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00*******************");
                                     assert(ios.width() == 0);
@@ -19084,7 +19084,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0e+00");
                                     assert(ios.width() == 0);
@@ -19092,7 +19092,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0e+00");
                                     assert(ios.width() == 0);
@@ -19102,7 +19102,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00");
                                     assert(ios.width() == 0);
@@ -19110,7 +19110,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00*******************");
                                     assert(ios.width() == 0);
@@ -19118,7 +19118,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0e+00");
                                     assert(ios.width() == 0);
@@ -19126,7 +19126,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0e+00");
                                     assert(ios.width() == 0);
@@ -19139,7 +19139,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.e+00");
                                     assert(ios.width() == 0);
@@ -19147,7 +19147,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.e+00******************");
                                     assert(ios.width() == 0);
@@ -19155,7 +19155,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0.e+00");
                                     assert(ios.width() == 0);
@@ -19163,7 +19163,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0.e+00");
                                     assert(ios.width() == 0);
@@ -19173,7 +19173,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;e+00");
                                     assert(ios.width() == 0);
@@ -19181,7 +19181,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;e+00******************");
                                     assert(ios.width() == 0);
@@ -19189,7 +19189,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0;e+00");
                                     assert(ios.width() == 0);
@@ -19197,7 +19197,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0;e+00");
                                     assert(ios.width() == 0);
@@ -19213,7 +19213,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00");
                                     assert(ios.width() == 0);
@@ -19221,7 +19221,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00*******************");
                                     assert(ios.width() == 0);
@@ -19229,7 +19229,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0e+00");
                                     assert(ios.width() == 0);
@@ -19237,7 +19237,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0e+00");
                                     assert(ios.width() == 0);
@@ -19247,7 +19247,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00");
                                     assert(ios.width() == 0);
@@ -19255,7 +19255,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0e+00*******************");
                                     assert(ios.width() == 0);
@@ -19263,7 +19263,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0e+00");
                                     assert(ios.width() == 0);
@@ -19271,7 +19271,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0e+00");
                                     assert(ios.width() == 0);
@@ -19284,7 +19284,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.e+00");
                                     assert(ios.width() == 0);
@@ -19292,7 +19292,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.e+00******************");
                                     assert(ios.width() == 0);
@@ -19300,7 +19300,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0.e+00");
                                     assert(ios.width() == 0);
@@ -19308,7 +19308,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0.e+00");
                                     assert(ios.width() == 0);
@@ -19318,7 +19318,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;e+00");
                                     assert(ios.width() == 0);
@@ -19326,7 +19326,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;e+00******************");
                                     assert(ios.width() == 0);
@@ -19334,7 +19334,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0;e+00");
                                     assert(ios.width() == 0);
@@ -19342,7 +19342,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0;e+00");
                                     assert(ios.width() == 0);
@@ -19361,7 +19361,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00");
                                     assert(ios.width() == 0);
@@ -19369,7 +19369,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00*******************");
                                     assert(ios.width() == 0);
@@ -19377,7 +19377,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0E+00");
                                     assert(ios.width() == 0);
@@ -19385,7 +19385,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0E+00");
                                     assert(ios.width() == 0);
@@ -19395,7 +19395,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00");
                                     assert(ios.width() == 0);
@@ -19403,7 +19403,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00*******************");
                                     assert(ios.width() == 0);
@@ -19411,7 +19411,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0E+00");
                                     assert(ios.width() == 0);
@@ -19419,7 +19419,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0E+00");
                                     assert(ios.width() == 0);
@@ -19432,7 +19432,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.E+00");
                                     assert(ios.width() == 0);
@@ -19440,7 +19440,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.E+00******************");
                                     assert(ios.width() == 0);
@@ -19448,7 +19448,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0.E+00");
                                     assert(ios.width() == 0);
@@ -19456,7 +19456,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0.E+00");
                                     assert(ios.width() == 0);
@@ -19466,7 +19466,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;E+00");
                                     assert(ios.width() == 0);
@@ -19474,7 +19474,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;E+00******************");
                                     assert(ios.width() == 0);
@@ -19482,7 +19482,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0;E+00");
                                     assert(ios.width() == 0);
@@ -19490,7 +19490,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0;E+00");
                                     assert(ios.width() == 0);
@@ -19506,7 +19506,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00");
                                     assert(ios.width() == 0);
@@ -19514,7 +19514,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00*******************");
                                     assert(ios.width() == 0);
@@ -19522,7 +19522,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0E+00");
                                     assert(ios.width() == 0);
@@ -19530,7 +19530,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0E+00");
                                     assert(ios.width() == 0);
@@ -19540,7 +19540,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00");
                                     assert(ios.width() == 0);
@@ -19548,7 +19548,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0E+00*******************");
                                     assert(ios.width() == 0);
@@ -19556,7 +19556,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************-0E+00");
                                     assert(ios.width() == 0);
@@ -19564,7 +19564,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*******************0E+00");
                                     assert(ios.width() == 0);
@@ -19577,7 +19577,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.E+00");
                                     assert(ios.width() == 0);
@@ -19585,7 +19585,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.E+00******************");
                                     assert(ios.width() == 0);
@@ -19593,7 +19593,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0.E+00");
                                     assert(ios.width() == 0);
@@ -19601,7 +19601,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0.E+00");
                                     assert(ios.width() == 0);
@@ -19611,7 +19611,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;E+00");
                                     assert(ios.width() == 0);
@@ -19619,7 +19619,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;E+00******************");
                                     assert(ios.width() == 0);
@@ -19627,7 +19627,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0;E+00");
                                     assert(ios.width() == 0);
@@ -19635,7 +19635,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0;E+00");
                                     assert(ios.width() == 0);
@@ -19657,7 +19657,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00");
                                     assert(ios.width() == 0);
@@ -19665,7 +19665,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00*****************");
                                     assert(ios.width() == 0);
@@ -19673,7 +19673,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0e+00");
                                     assert(ios.width() == 0);
@@ -19681,7 +19681,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0e+00");
                                     assert(ios.width() == 0);
@@ -19691,7 +19691,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00");
                                     assert(ios.width() == 0);
@@ -19699,7 +19699,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00*****************");
                                     assert(ios.width() == 0);
@@ -19707,7 +19707,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0e+00");
                                     assert(ios.width() == 0);
@@ -19715,7 +19715,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0e+00");
                                     assert(ios.width() == 0);
@@ -19728,7 +19728,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00");
                                     assert(ios.width() == 0);
@@ -19736,7 +19736,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00*****************");
                                     assert(ios.width() == 0);
@@ -19744,7 +19744,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0e+00");
                                     assert(ios.width() == 0);
@@ -19752,7 +19752,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0e+00");
                                     assert(ios.width() == 0);
@@ -19762,7 +19762,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00");
                                     assert(ios.width() == 0);
@@ -19770,7 +19770,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00*****************");
                                     assert(ios.width() == 0);
@@ -19778,7 +19778,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0e+00");
                                     assert(ios.width() == 0);
@@ -19786,7 +19786,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0e+00");
                                     assert(ios.width() == 0);
@@ -19802,7 +19802,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00");
                                     assert(ios.width() == 0);
@@ -19810,7 +19810,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00*****************");
                                     assert(ios.width() == 0);
@@ -19818,7 +19818,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0e+00");
                                     assert(ios.width() == 0);
@@ -19826,7 +19826,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0e+00");
                                     assert(ios.width() == 0);
@@ -19836,7 +19836,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00");
                                     assert(ios.width() == 0);
@@ -19844,7 +19844,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00*****************");
                                     assert(ios.width() == 0);
@@ -19852,7 +19852,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0e+00");
                                     assert(ios.width() == 0);
@@ -19860,7 +19860,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0e+00");
                                     assert(ios.width() == 0);
@@ -19873,7 +19873,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00");
                                     assert(ios.width() == 0);
@@ -19881,7 +19881,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0e+00*****************");
                                     assert(ios.width() == 0);
@@ -19889,7 +19889,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0e+00");
                                     assert(ios.width() == 0);
@@ -19897,7 +19897,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0e+00");
                                     assert(ios.width() == 0);
@@ -19907,7 +19907,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00");
                                     assert(ios.width() == 0);
@@ -19915,7 +19915,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0e+00*****************");
                                     assert(ios.width() == 0);
@@ -19923,7 +19923,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0e+00");
                                     assert(ios.width() == 0);
@@ -19931,7 +19931,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0e+00");
                                     assert(ios.width() == 0);
@@ -19950,7 +19950,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00");
                                     assert(ios.width() == 0);
@@ -19958,7 +19958,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00*****************");
                                     assert(ios.width() == 0);
@@ -19966,7 +19966,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0E+00");
                                     assert(ios.width() == 0);
@@ -19974,7 +19974,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0E+00");
                                     assert(ios.width() == 0);
@@ -19984,7 +19984,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00");
                                     assert(ios.width() == 0);
@@ -19992,7 +19992,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00*****************");
                                     assert(ios.width() == 0);
@@ -20000,7 +20000,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0E+00");
                                     assert(ios.width() == 0);
@@ -20008,7 +20008,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0E+00");
                                     assert(ios.width() == 0);
@@ -20021,7 +20021,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00");
                                     assert(ios.width() == 0);
@@ -20029,7 +20029,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00*****************");
                                     assert(ios.width() == 0);
@@ -20037,7 +20037,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0E+00");
                                     assert(ios.width() == 0);
@@ -20045,7 +20045,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0E+00");
                                     assert(ios.width() == 0);
@@ -20055,7 +20055,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00");
                                     assert(ios.width() == 0);
@@ -20063,7 +20063,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00*****************");
                                     assert(ios.width() == 0);
@@ -20071,7 +20071,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0E+00");
                                     assert(ios.width() == 0);
@@ -20079,7 +20079,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0E+00");
                                     assert(ios.width() == 0);
@@ -20095,7 +20095,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00");
                                     assert(ios.width() == 0);
@@ -20103,7 +20103,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00*****************");
                                     assert(ios.width() == 0);
@@ -20111,7 +20111,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0E+00");
                                     assert(ios.width() == 0);
@@ -20119,7 +20119,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0E+00");
                                     assert(ios.width() == 0);
@@ -20129,7 +20129,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00");
                                     assert(ios.width() == 0);
@@ -20137,7 +20137,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00*****************");
                                     assert(ios.width() == 0);
@@ -20145,7 +20145,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0E+00");
                                     assert(ios.width() == 0);
@@ -20153,7 +20153,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0E+00");
                                     assert(ios.width() == 0);
@@ -20166,7 +20166,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00");
                                     assert(ios.width() == 0);
@@ -20174,7 +20174,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.0E+00*****************");
                                     assert(ios.width() == 0);
@@ -20182,7 +20182,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0.0E+00");
                                     assert(ios.width() == 0);
@@ -20190,7 +20190,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0.0E+00");
                                     assert(ios.width() == 0);
@@ -20200,7 +20200,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00");
                                     assert(ios.width() == 0);
@@ -20208,7 +20208,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;0E+00*****************");
                                     assert(ios.width() == 0);
@@ -20216,7 +20216,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0;0E+00");
                                     assert(ios.width() == 0);
@@ -20224,7 +20224,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0;0E+00");
                                     assert(ios.width() == 0);
@@ -20246,7 +20246,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20254,7 +20254,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00************");
                                     assert(ios.width() == 0);
@@ -20262,7 +20262,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20270,7 +20270,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20280,7 +20280,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20288,7 +20288,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00************");
                                     assert(ios.width() == 0);
@@ -20296,7 +20296,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20304,7 +20304,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20317,7 +20317,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20325,7 +20325,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00************");
                                     assert(ios.width() == 0);
@@ -20333,7 +20333,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20341,7 +20341,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20351,7 +20351,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20359,7 +20359,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00************");
                                     assert(ios.width() == 0);
@@ -20367,7 +20367,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20375,7 +20375,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20391,7 +20391,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20399,7 +20399,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00************");
                                     assert(ios.width() == 0);
@@ -20407,7 +20407,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20415,7 +20415,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20425,7 +20425,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20433,7 +20433,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00************");
                                     assert(ios.width() == 0);
@@ -20441,7 +20441,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20449,7 +20449,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20462,7 +20462,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20470,7 +20470,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000e+00************");
                                     assert(ios.width() == 0);
@@ -20478,7 +20478,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20486,7 +20486,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000e+00");
                                     assert(ios.width() == 0);
@@ -20496,7 +20496,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20504,7 +20504,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000e+00************");
                                     assert(ios.width() == 0);
@@ -20512,7 +20512,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20520,7 +20520,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000e+00");
                                     assert(ios.width() == 0);
@@ -20539,7 +20539,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20547,7 +20547,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00************");
                                     assert(ios.width() == 0);
@@ -20555,7 +20555,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20563,7 +20563,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20573,7 +20573,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20581,7 +20581,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00************");
                                     assert(ios.width() == 0);
@@ -20589,7 +20589,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20597,7 +20597,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20610,7 +20610,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20618,7 +20618,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00************");
                                     assert(ios.width() == 0);
@@ -20626,7 +20626,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20634,7 +20634,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20644,7 +20644,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20652,7 +20652,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00************");
                                     assert(ios.width() == 0);
@@ -20660,7 +20660,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20668,7 +20668,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20684,7 +20684,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20692,7 +20692,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00************");
                                     assert(ios.width() == 0);
@@ -20700,7 +20700,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20708,7 +20708,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20718,7 +20718,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20726,7 +20726,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00************");
                                     assert(ios.width() == 0);
@@ -20734,7 +20734,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20742,7 +20742,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20755,7 +20755,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20763,7 +20763,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0.000000E+00************");
                                     assert(ios.width() == 0);
@@ -20771,7 +20771,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20779,7 +20779,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0.000000E+00");
                                     assert(ios.width() == 0);
@@ -20789,7 +20789,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20797,7 +20797,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0;000000E+00************");
                                     assert(ios.width() == 0);
@@ -20805,7 +20805,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "************-0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20813,7 +20813,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-************0;000000E+00");
                                     assert(ios.width() == 0);
@@ -20836,7 +20836,7 @@
 void test10()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -20858,7 +20858,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -20866,7 +20866,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -20874,7 +20874,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -20882,7 +20882,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -20892,7 +20892,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09");
                                     assert(ios.width() == 0);
@@ -20900,7 +20900,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1e+09********************");
                                     assert(ios.width() == 0);
@@ -20908,7 +20908,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -20916,7 +20916,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1e+09");
                                     assert(ios.width() == 0);
@@ -20929,7 +20929,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09");
                                     assert(ios.width() == 0);
@@ -20937,7 +20937,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.e+09*******************");
                                     assert(ios.width() == 0);
@@ -20945,7 +20945,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -20953,7 +20953,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.e+09");
                                     assert(ios.width() == 0);
@@ -20963,7 +20963,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09");
                                     assert(ios.width() == 0);
@@ -20971,7 +20971,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;e+09*******************");
                                     assert(ios.width() == 0);
@@ -20979,7 +20979,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -20987,7 +20987,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;e+09");
                                     assert(ios.width() == 0);
@@ -21003,7 +21003,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -21011,7 +21011,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -21019,7 +21019,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -21027,7 +21027,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -21037,7 +21037,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09");
                                     assert(ios.width() == 0);
@@ -21045,7 +21045,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1e+09*******************");
                                     assert(ios.width() == 0);
@@ -21053,7 +21053,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1e+09");
                                     assert(ios.width() == 0);
@@ -21061,7 +21061,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1e+09");
                                     assert(ios.width() == 0);
@@ -21074,7 +21074,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09");
                                     assert(ios.width() == 0);
@@ -21082,7 +21082,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.e+09******************");
                                     assert(ios.width() == 0);
@@ -21090,7 +21090,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.e+09");
                                     assert(ios.width() == 0);
@@ -21098,7 +21098,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.e+09");
                                     assert(ios.width() == 0);
@@ -21108,7 +21108,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09");
                                     assert(ios.width() == 0);
@@ -21116,7 +21116,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;e+09******************");
                                     assert(ios.width() == 0);
@@ -21124,7 +21124,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;e+09");
                                     assert(ios.width() == 0);
@@ -21132,7 +21132,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;e+09");
                                     assert(ios.width() == 0);
@@ -21151,7 +21151,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -21159,7 +21159,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -21167,7 +21167,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -21175,7 +21175,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -21185,7 +21185,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09");
                                     assert(ios.width() == 0);
@@ -21193,7 +21193,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1E+09********************");
                                     assert(ios.width() == 0);
@@ -21201,7 +21201,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -21209,7 +21209,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********************1E+09");
                                     assert(ios.width() == 0);
@@ -21222,7 +21222,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09");
                                     assert(ios.width() == 0);
@@ -21230,7 +21230,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.E+09*******************");
                                     assert(ios.width() == 0);
@@ -21238,7 +21238,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -21246,7 +21246,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1.E+09");
                                     assert(ios.width() == 0);
@@ -21256,7 +21256,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09");
                                     assert(ios.width() == 0);
@@ -21264,7 +21264,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;E+09*******************");
                                     assert(ios.width() == 0);
@@ -21272,7 +21272,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -21280,7 +21280,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************1;E+09");
                                     assert(ios.width() == 0);
@@ -21296,7 +21296,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -21304,7 +21304,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -21312,7 +21312,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -21320,7 +21320,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -21330,7 +21330,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09");
                                     assert(ios.width() == 0);
@@ -21338,7 +21338,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1E+09*******************");
                                     assert(ios.width() == 0);
@@ -21346,7 +21346,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*******************+1E+09");
                                     assert(ios.width() == 0);
@@ -21354,7 +21354,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*******************1E+09");
                                     assert(ios.width() == 0);
@@ -21367,7 +21367,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09");
                                     assert(ios.width() == 0);
@@ -21375,7 +21375,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.E+09******************");
                                     assert(ios.width() == 0);
@@ -21383,7 +21383,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1.E+09");
                                     assert(ios.width() == 0);
@@ -21391,7 +21391,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1.E+09");
                                     assert(ios.width() == 0);
@@ -21401,7 +21401,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09");
                                     assert(ios.width() == 0);
@@ -21409,7 +21409,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;E+09******************");
                                     assert(ios.width() == 0);
@@ -21417,7 +21417,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************+1;E+09");
                                     assert(ios.width() == 0);
@@ -21425,7 +21425,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+******************1;E+09");
                                     assert(ios.width() == 0);
@@ -21447,7 +21447,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2e+09");
                                     assert(ios.width() == 0);
@@ -21455,7 +21455,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2e+09******************");
                                     assert(ios.width() == 0);
@@ -21463,7 +21463,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2e+09");
                                     assert(ios.width() == 0);
@@ -21471,7 +21471,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2e+09");
                                     assert(ios.width() == 0);
@@ -21481,7 +21481,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2e+09");
                                     assert(ios.width() == 0);
@@ -21489,7 +21489,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2e+09******************");
                                     assert(ios.width() == 0);
@@ -21497,7 +21497,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2e+09");
                                     assert(ios.width() == 0);
@@ -21505,7 +21505,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2e+09");
                                     assert(ios.width() == 0);
@@ -21518,7 +21518,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2e+09");
                                     assert(ios.width() == 0);
@@ -21526,7 +21526,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2e+09******************");
                                     assert(ios.width() == 0);
@@ -21534,7 +21534,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2e+09");
                                     assert(ios.width() == 0);
@@ -21542,7 +21542,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2e+09");
                                     assert(ios.width() == 0);
@@ -21552,7 +21552,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2e+09");
                                     assert(ios.width() == 0);
@@ -21560,7 +21560,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2e+09******************");
                                     assert(ios.width() == 0);
@@ -21568,7 +21568,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2e+09");
                                     assert(ios.width() == 0);
@@ -21576,7 +21576,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2e+09");
                                     assert(ios.width() == 0);
@@ -21592,7 +21592,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2e+09");
                                     assert(ios.width() == 0);
@@ -21600,7 +21600,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2e+09*****************");
                                     assert(ios.width() == 0);
@@ -21608,7 +21608,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1.2e+09");
                                     assert(ios.width() == 0);
@@ -21616,7 +21616,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1.2e+09");
                                     assert(ios.width() == 0);
@@ -21626,7 +21626,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2e+09");
                                     assert(ios.width() == 0);
@@ -21634,7 +21634,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2e+09*****************");
                                     assert(ios.width() == 0);
@@ -21642,7 +21642,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1;2e+09");
                                     assert(ios.width() == 0);
@@ -21650,7 +21650,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1;2e+09");
                                     assert(ios.width() == 0);
@@ -21663,7 +21663,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2e+09");
                                     assert(ios.width() == 0);
@@ -21671,7 +21671,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2e+09*****************");
                                     assert(ios.width() == 0);
@@ -21679,7 +21679,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1.2e+09");
                                     assert(ios.width() == 0);
@@ -21687,7 +21687,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1.2e+09");
                                     assert(ios.width() == 0);
@@ -21697,7 +21697,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2e+09");
                                     assert(ios.width() == 0);
@@ -21705,7 +21705,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2e+09*****************");
                                     assert(ios.width() == 0);
@@ -21713,7 +21713,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1;2e+09");
                                     assert(ios.width() == 0);
@@ -21721,7 +21721,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1;2e+09");
                                     assert(ios.width() == 0);
@@ -21740,7 +21740,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2E+09");
                                     assert(ios.width() == 0);
@@ -21748,7 +21748,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2E+09******************");
                                     assert(ios.width() == 0);
@@ -21756,7 +21756,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2E+09");
                                     assert(ios.width() == 0);
@@ -21764,7 +21764,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2E+09");
                                     assert(ios.width() == 0);
@@ -21774,7 +21774,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2E+09");
                                     assert(ios.width() == 0);
@@ -21782,7 +21782,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2E+09******************");
                                     assert(ios.width() == 0);
@@ -21790,7 +21790,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2E+09");
                                     assert(ios.width() == 0);
@@ -21798,7 +21798,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2E+09");
                                     assert(ios.width() == 0);
@@ -21811,7 +21811,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2E+09");
                                     assert(ios.width() == 0);
@@ -21819,7 +21819,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.2E+09******************");
                                     assert(ios.width() == 0);
@@ -21827,7 +21827,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2E+09");
                                     assert(ios.width() == 0);
@@ -21835,7 +21835,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1.2E+09");
                                     assert(ios.width() == 0);
@@ -21845,7 +21845,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2E+09");
                                     assert(ios.width() == 0);
@@ -21853,7 +21853,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;2E+09******************");
                                     assert(ios.width() == 0);
@@ -21861,7 +21861,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2E+09");
                                     assert(ios.width() == 0);
@@ -21869,7 +21869,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************1;2E+09");
                                     assert(ios.width() == 0);
@@ -21885,7 +21885,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2E+09");
                                     assert(ios.width() == 0);
@@ -21893,7 +21893,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2E+09*****************");
                                     assert(ios.width() == 0);
@@ -21901,7 +21901,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1.2E+09");
                                     assert(ios.width() == 0);
@@ -21909,7 +21909,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1.2E+09");
                                     assert(ios.width() == 0);
@@ -21919,7 +21919,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2E+09");
                                     assert(ios.width() == 0);
@@ -21927,7 +21927,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2E+09*****************");
                                     assert(ios.width() == 0);
@@ -21935,7 +21935,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1;2E+09");
                                     assert(ios.width() == 0);
@@ -21943,7 +21943,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1;2E+09");
                                     assert(ios.width() == 0);
@@ -21956,7 +21956,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2E+09");
                                     assert(ios.width() == 0);
@@ -21964,7 +21964,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.2E+09*****************");
                                     assert(ios.width() == 0);
@@ -21972,7 +21972,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1.2E+09");
                                     assert(ios.width() == 0);
@@ -21980,7 +21980,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1.2E+09");
                                     assert(ios.width() == 0);
@@ -21990,7 +21990,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2E+09");
                                     assert(ios.width() == 0);
@@ -21998,7 +21998,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;2E+09*****************");
                                     assert(ios.width() == 0);
@@ -22006,7 +22006,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************+1;2E+09");
                                     assert(ios.width() == 0);
@@ -22014,7 +22014,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+*****************1;2E+09");
                                     assert(ios.width() == 0);
@@ -22042,7 +22042,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22050,7 +22050,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22058,7 +22058,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22066,7 +22066,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22076,7 +22076,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22084,7 +22084,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22092,7 +22092,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22100,7 +22100,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22113,7 +22113,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22121,7 +22121,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22129,7 +22129,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22137,7 +22137,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22147,7 +22147,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22155,7 +22155,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22163,7 +22163,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22171,7 +22171,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22187,7 +22187,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22195,7 +22195,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22203,7 +22203,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22211,7 +22211,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22221,7 +22221,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22229,7 +22229,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22237,7 +22237,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22245,7 +22245,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22258,7 +22258,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22266,7 +22266,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22274,7 +22274,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22282,7 +22282,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22292,7 +22292,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22300,7 +22300,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22308,7 +22308,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22316,7 +22316,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000e+09");
                                     assert(ios.width() == 0);
@@ -22335,7 +22335,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22343,7 +22343,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22351,7 +22351,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22359,7 +22359,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22369,7 +22369,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22377,7 +22377,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22385,7 +22385,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22393,7 +22393,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22406,7 +22406,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22414,7 +22414,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22422,7 +22422,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22430,7 +22430,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22440,7 +22440,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22448,7 +22448,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22456,7 +22456,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22464,7 +22464,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22480,7 +22480,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22488,7 +22488,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22496,7 +22496,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22504,7 +22504,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22514,7 +22514,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22522,7 +22522,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22530,7 +22530,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22538,7 +22538,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22551,7 +22551,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22559,7 +22559,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22567,7 +22567,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22575,7 +22575,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1.234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22585,7 +22585,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22593,7 +22593,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22601,7 +22601,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22609,7 +22609,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+1;234567890125000000000000000000000000000000000000000000000000E+09");
                                     assert(ios.width() == 0);
@@ -22626,7 +22626,7 @@
 void test11()
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     std::locale lc = std::locale::classic();
     std::locale lg(lc, new my_numpunct);
     const my_facet f(1);
@@ -22648,7 +22648,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -22656,7 +22656,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -22664,7 +22664,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -22672,7 +22672,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -22682,7 +22682,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -22690,7 +22690,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -22698,7 +22698,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -22706,7 +22706,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -22719,7 +22719,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -22727,7 +22727,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -22735,7 +22735,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -22743,7 +22743,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -22753,7 +22753,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -22761,7 +22761,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -22769,7 +22769,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -22777,7 +22777,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -22793,7 +22793,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -22801,7 +22801,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -22809,7 +22809,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -22817,7 +22817,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -22827,7 +22827,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -22835,7 +22835,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -22843,7 +22843,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -22851,7 +22851,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -22864,7 +22864,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -22872,7 +22872,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -22880,7 +22880,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -22888,7 +22888,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -22898,7 +22898,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -22906,7 +22906,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -22914,7 +22914,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -22922,7 +22922,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -22941,7 +22941,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -22949,7 +22949,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -22957,7 +22957,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -22965,7 +22965,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -22975,7 +22975,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -22983,7 +22983,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -22991,7 +22991,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -22999,7 +22999,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -23012,7 +23012,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23020,7 +23020,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -23028,7 +23028,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23036,7 +23036,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23046,7 +23046,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23054,7 +23054,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -23062,7 +23062,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23070,7 +23070,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23086,7 +23086,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23094,7 +23094,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -23102,7 +23102,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23110,7 +23110,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -23120,7 +23120,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23128,7 +23128,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -23136,7 +23136,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23144,7 +23144,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -23157,7 +23157,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23165,7 +23165,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -23173,7 +23173,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23181,7 +23181,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23191,7 +23191,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23199,7 +23199,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -23207,7 +23207,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23215,7 +23215,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23237,7 +23237,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23245,7 +23245,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -23253,7 +23253,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23261,7 +23261,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -23271,7 +23271,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23279,7 +23279,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -23287,7 +23287,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23295,7 +23295,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -23308,7 +23308,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -23316,7 +23316,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -23324,7 +23324,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -23332,7 +23332,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -23342,7 +23342,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -23350,7 +23350,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -23358,7 +23358,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -23366,7 +23366,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -23382,7 +23382,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23390,7 +23390,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -23398,7 +23398,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23406,7 +23406,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -23416,7 +23416,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23424,7 +23424,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -23432,7 +23432,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23440,7 +23440,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -23453,7 +23453,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -23461,7 +23461,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -23469,7 +23469,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -23477,7 +23477,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -23487,7 +23487,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -23495,7 +23495,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -23503,7 +23503,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -23511,7 +23511,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -23530,7 +23530,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23538,7 +23538,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -23546,7 +23546,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23554,7 +23554,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -23564,7 +23564,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23572,7 +23572,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -23580,7 +23580,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23588,7 +23588,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -23601,7 +23601,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23609,7 +23609,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -23617,7 +23617,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23625,7 +23625,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23635,7 +23635,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23643,7 +23643,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -23651,7 +23651,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23659,7 +23659,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23675,7 +23675,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23683,7 +23683,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -23691,7 +23691,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23699,7 +23699,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -23709,7 +23709,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23717,7 +23717,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -23725,7 +23725,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -23733,7 +23733,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -23746,7 +23746,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23754,7 +23754,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -23762,7 +23762,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23770,7 +23770,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -23780,7 +23780,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23788,7 +23788,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -23796,7 +23796,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23804,7 +23804,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -23826,7 +23826,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23834,7 +23834,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -23842,7 +23842,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23850,7 +23850,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -23860,7 +23860,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23868,7 +23868,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -23876,7 +23876,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23884,7 +23884,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -23897,7 +23897,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -23905,7 +23905,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -23913,7 +23913,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -23921,7 +23921,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -23931,7 +23931,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -23939,7 +23939,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -23947,7 +23947,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -23955,7 +23955,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -23971,7 +23971,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23979,7 +23979,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -23987,7 +23987,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -23995,7 +23995,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -24005,7 +24005,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0");
                                     assert(ios.width() == 0);
@@ -24013,7 +24013,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0p+0******************");
                                     assert(ios.width() == 0);
@@ -24021,7 +24021,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0x0p+0");
                                     assert(ios.width() == 0);
@@ -24029,7 +24029,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0x0p+0");
                                     assert(ios.width() == 0);
@@ -24042,7 +24042,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -24050,7 +24050,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0.p+0*****************");
                                     assert(ios.width() == 0);
@@ -24058,7 +24058,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0.p+0");
                                     assert(ios.width() == 0);
@@ -24066,7 +24066,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0.p+0");
                                     assert(ios.width() == 0);
@@ -24076,7 +24076,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -24084,7 +24084,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0x0;p+0*****************");
                                     assert(ios.width() == 0);
@@ -24092,7 +24092,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0x0;p+0");
                                     assert(ios.width() == 0);
@@ -24100,7 +24100,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0x0;p+0");
                                     assert(ios.width() == 0);
@@ -24119,7 +24119,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -24127,7 +24127,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -24135,7 +24135,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -24143,7 +24143,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -24153,7 +24153,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -24161,7 +24161,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -24169,7 +24169,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -24177,7 +24177,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -24190,7 +24190,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -24198,7 +24198,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -24206,7 +24206,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -24214,7 +24214,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -24224,7 +24224,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -24232,7 +24232,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -24240,7 +24240,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -24248,7 +24248,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -24264,7 +24264,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -24272,7 +24272,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -24280,7 +24280,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -24288,7 +24288,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -24298,7 +24298,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0");
                                     assert(ios.width() == 0);
@@ -24306,7 +24306,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0P+0******************");
                                     assert(ios.width() == 0);
@@ -24314,7 +24314,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "******************-0X0P+0");
                                     assert(ios.width() == 0);
@@ -24322,7 +24322,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-******************0X0P+0");
                                     assert(ios.width() == 0);
@@ -24335,7 +24335,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -24343,7 +24343,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0.P+0*****************");
                                     assert(ios.width() == 0);
@@ -24351,7 +24351,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0.P+0");
                                     assert(ios.width() == 0);
@@ -24359,7 +24359,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0.P+0");
                                     assert(ios.width() == 0);
@@ -24369,7 +24369,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -24377,7 +24377,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-0X0;P+0*****************");
                                     assert(ios.width() == 0);
@@ -24385,7 +24385,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*****************-0X0;P+0");
                                     assert(ios.width() == 0);
@@ -24393,7 +24393,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "-*****************0X0;P+0");
                                     assert(ios.width() == 0);
@@ -24420,7 +24420,7 @@
 #if defined(__APPLE__) && defined(__x86_64__)
 // This test is failing on FreeBSD, possibly due to different representations
 // of the floating point numbers.
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     const my_facet f(1);
     char str[200];
     {
@@ -24441,7 +24441,7 @@
                             ios.imbue(lc);
                             {
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24449,7 +24449,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -24457,7 +24457,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24465,7 +24465,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24475,7 +24475,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24483,7 +24483,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -24491,7 +24491,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24499,7 +24499,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24512,7 +24512,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24520,7 +24520,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -24528,7 +24528,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24536,7 +24536,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24546,7 +24546,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24554,7 +24554,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -24562,7 +24562,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24570,7 +24570,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24586,7 +24586,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24594,7 +24594,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -24602,7 +24602,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24610,7 +24610,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24620,7 +24620,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24628,7 +24628,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -24636,7 +24636,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24644,7 +24644,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24657,7 +24657,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24665,7 +24665,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -24673,7 +24673,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24681,7 +24681,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24691,7 +24691,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24699,7 +24699,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -24707,7 +24707,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24715,7 +24715,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -24734,7 +24734,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24742,7 +24742,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -24750,7 +24750,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24758,7 +24758,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24768,7 +24768,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24776,7 +24776,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -24784,7 +24784,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24792,7 +24792,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24805,7 +24805,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24813,7 +24813,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -24821,7 +24821,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24829,7 +24829,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24839,7 +24839,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24847,7 +24847,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -24855,7 +24855,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24863,7 +24863,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24879,7 +24879,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24887,7 +24887,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -24895,7 +24895,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24903,7 +24903,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24913,7 +24913,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24921,7 +24921,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -24929,7 +24929,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24937,7 +24937,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24950,7 +24950,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24958,7 +24958,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -24966,7 +24966,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24974,7 +24974,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24984,7 +24984,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -24992,7 +24992,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -25000,7 +25000,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25008,7 +25008,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25030,7 +25030,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25038,7 +25038,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -25046,7 +25046,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25054,7 +25054,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25064,7 +25064,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25072,7 +25072,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -25080,7 +25080,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25088,7 +25088,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25101,7 +25101,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25109,7 +25109,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -25117,7 +25117,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25125,7 +25125,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25135,7 +25135,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25143,7 +25143,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -25151,7 +25151,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25159,7 +25159,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25175,7 +25175,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25183,7 +25183,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -25191,7 +25191,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25199,7 +25199,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25209,7 +25209,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25217,7 +25217,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -25225,7 +25225,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25233,7 +25233,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25246,7 +25246,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25254,7 +25254,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -25262,7 +25262,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25270,7 +25270,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25280,7 +25280,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25288,7 +25288,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -25296,7 +25296,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25304,7 +25304,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25323,7 +25323,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25331,7 +25331,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -25339,7 +25339,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25347,7 +25347,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25357,7 +25357,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25365,7 +25365,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -25373,7 +25373,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25381,7 +25381,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25394,7 +25394,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25402,7 +25402,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -25410,7 +25410,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25418,7 +25418,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25428,7 +25428,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25436,7 +25436,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -25444,7 +25444,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25452,7 +25452,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25468,7 +25468,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25476,7 +25476,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -25484,7 +25484,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25492,7 +25492,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25502,7 +25502,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25510,7 +25510,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -25518,7 +25518,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25526,7 +25526,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25539,7 +25539,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25547,7 +25547,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -25555,7 +25555,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25563,7 +25563,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25573,7 +25573,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25581,7 +25581,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -25589,7 +25589,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25597,7 +25597,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25625,7 +25625,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25633,7 +25633,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -25641,7 +25641,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25649,7 +25649,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25659,7 +25659,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25667,7 +25667,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -25675,7 +25675,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25683,7 +25683,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25696,7 +25696,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25704,7 +25704,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9.32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -25712,7 +25712,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25720,7 +25720,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25730,7 +25730,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25738,7 +25738,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x9;32c05a44p+27*********");
                                     assert(ios.width() == 0);
@@ -25746,7 +25746,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25754,7 +25754,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0x*********9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25770,7 +25770,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25778,7 +25778,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -25786,7 +25786,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25794,7 +25794,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25804,7 +25804,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25812,7 +25812,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -25820,7 +25820,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25828,7 +25828,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25841,7 +25841,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25849,7 +25849,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9.32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -25857,7 +25857,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25865,7 +25865,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9.32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25875,7 +25875,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25883,7 +25883,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0x9;32c05a44p+27********");
                                     assert(ios.width() == 0);
@@ -25891,7 +25891,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25899,7 +25899,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0x9;32c05a44p+27");
                                     assert(ios.width() == 0);
@@ -25918,7 +25918,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25926,7 +25926,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -25934,7 +25934,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25942,7 +25942,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25952,7 +25952,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25960,7 +25960,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -25968,7 +25968,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25976,7 +25976,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25989,7 +25989,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -25997,7 +25997,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9.32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -26005,7 +26005,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26013,7 +26013,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26023,7 +26023,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26031,7 +26031,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X9;32C05A44P+27*********");
                                     assert(ios.width() == 0);
@@ -26039,7 +26039,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "*********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26047,7 +26047,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "0X*********9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26063,7 +26063,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26071,7 +26071,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -26079,7 +26079,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26087,7 +26087,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26097,7 +26097,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26105,7 +26105,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -26113,7 +26113,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26121,7 +26121,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26134,7 +26134,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26142,7 +26142,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9.32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -26150,7 +26150,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26158,7 +26158,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9.32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26168,7 +26168,7 @@
                             {
                                 ios.width(0);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26176,7 +26176,7 @@
                                 ios.width(25);
                                 left(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+0X9;32C05A44P+27********");
                                     assert(ios.width() == 0);
@@ -26184,7 +26184,7 @@
                                 ios.width(25);
                                 right(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "********+0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
@@ -26192,7 +26192,7 @@
                                 ios.width(25);
                                 internal(ios);
                                 {
-                                    iter = f.put(output_iterator<char*>(str), ios, '*', v);
+                                    iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
                                     std::string ex(str, iter.base());
                                     assert(ex == "+********0X9;32C05A44P+27");
                                     assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_long.pass.cpp
@@ -19,7 +19,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::num_put<char, output_iterator<char*> > F;
+typedef std::num_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -47,7 +47,7 @@
         std::ios ios(0);
         long long v = 0;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0");
     }
@@ -55,7 +55,7 @@
         std::ios ios(0);
         long long v = 1;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1");
     }
@@ -63,7 +63,7 @@
         std::ios ios(0);
         long long v = -1;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1");
     }
@@ -71,7 +71,7 @@
         std::ios ios(0);
         long long v = -1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1000");
     }
@@ -79,7 +79,7 @@
         std::ios ios(0);
         long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1000");
     }
@@ -88,7 +88,7 @@
         showpos(ios);
         long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "+1000");
     }
@@ -97,7 +97,7 @@
         oct(ios);
         long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1750");
     }
@@ -107,7 +107,7 @@
         showbase(ios);
         long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "01750");
     }
@@ -116,7 +116,7 @@
         hex(ios);
         long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "3e8");
     }
@@ -126,7 +126,7 @@
         showbase(ios);
         long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x3e8");
     }
@@ -137,7 +137,7 @@
         uppercase(ios);
         long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0X3E8");
     }
@@ -149,7 +149,7 @@
         uppercase(ios);
         long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0X3E_8");
     }
@@ -160,7 +160,7 @@
         showbase(ios);
         long long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x7f_fff_ff_f");
     }
@@ -170,7 +170,7 @@
         oct(ios);
         long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "123_46_7");
     }
@@ -181,7 +181,7 @@
         showbase(ios);
         long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0_123_46_7");
     }
@@ -194,7 +194,7 @@
         ios.width(15);
         long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "*****0_123_46_7");
     }
@@ -207,7 +207,7 @@
         ios.width(15);
         long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0_123_46_7*****");
     }
@@ -220,7 +220,7 @@
         ios.width(15);
         long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "*****0_123_46_7");
         assert(ios.width() == 0);
@@ -234,7 +234,7 @@
         ios.width(15);
         long long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "**0x7f_fff_ff_f");
     }
@@ -247,7 +247,7 @@
         ios.width(15);
         long long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x7f_fff_ff_f**");
     }
@@ -260,7 +260,7 @@
         ios.width(15);
         long long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x**7f_fff_ff_f");
         assert(ios.width() == 0);
@@ -273,7 +273,7 @@
         right(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "***+1_00_0");
         assert(ios.width() == 0);
@@ -286,7 +286,7 @@
         left(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "+1_00_0***");
         assert(ios.width() == 0);
@@ -299,7 +299,7 @@
         internal(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "+***1_00_0");
         assert(ios.width() == 0);
@@ -312,7 +312,7 @@
         showpos(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "***-1_00_0");
         assert(ios.width() == 0);
@@ -324,7 +324,7 @@
         left(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-1_00_0***");
         assert(ios.width() == 0);
@@ -336,7 +336,7 @@
         internal(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "-***1_00_0");
         assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
@@ -19,7 +19,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::num_put<char, output_iterator<char*> > F;
+typedef std::num_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -36,7 +36,7 @@
         std::ios ios(0);
         void* v = 0;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         char expected_str[32] = {};
         // num_put::put uses %p for pointer types, but the exact format of %p is
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
@@ -19,7 +19,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::num_put<char, output_iterator<char*> > F;
+typedef std::num_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -47,7 +47,7 @@
         std::ios ios(0);
         unsigned long v = 0;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0");
     }
@@ -55,7 +55,7 @@
         std::ios ios(0);
         unsigned long v = 1;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1");
     }
@@ -63,7 +63,7 @@
         std::ios ios(0);
         unsigned long v = static_cast<unsigned long>(-1);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == (sizeof(unsigned long) == 4 ? "4294967295" : "18446744073709551615"));
     }
@@ -71,7 +71,7 @@
         std::ios ios(0);
         unsigned long v = static_cast<unsigned long>(-1000);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == (sizeof(unsigned long) == 4 ? "4294966296" : "18446744073709550616"));
     }
@@ -79,7 +79,7 @@
         std::ios ios(0);
         unsigned long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1000");
     }
@@ -88,7 +88,7 @@
         showpos(ios);
         unsigned long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1000");
     }
@@ -97,7 +97,7 @@
         oct(ios);
         unsigned long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1750");
     }
@@ -107,7 +107,7 @@
         showbase(ios);
         unsigned long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "01750");
     }
@@ -116,7 +116,7 @@
         hex(ios);
         unsigned long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "3e8");
     }
@@ -126,7 +126,7 @@
         showbase(ios);
         unsigned long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x3e8");
     }
@@ -137,7 +137,7 @@
         uppercase(ios);
         unsigned long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0X3E8");
     }
@@ -149,7 +149,7 @@
         uppercase(ios);
         unsigned long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0X3E_8");
     }
@@ -160,7 +160,7 @@
         showbase(ios);
         unsigned long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x7f_fff_ff_f");
     }
@@ -170,7 +170,7 @@
         oct(ios);
         unsigned long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "123_46_7");
     }
@@ -181,7 +181,7 @@
         showbase(ios);
         unsigned long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0_123_46_7");
     }
@@ -194,7 +194,7 @@
         ios.width(15);
         unsigned long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "*****0_123_46_7");
     }
@@ -207,7 +207,7 @@
         ios.width(15);
         unsigned long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0_123_46_7*****");
     }
@@ -220,7 +220,7 @@
         ios.width(15);
         unsigned long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "*****0_123_46_7");
         assert(ios.width() == 0);
@@ -234,7 +234,7 @@
         ios.width(15);
         unsigned long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "**0x7f_fff_ff_f");
     }
@@ -247,7 +247,7 @@
         ios.width(15);
         unsigned long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x7f_fff_ff_f**");
     }
@@ -260,7 +260,7 @@
         ios.width(15);
         unsigned long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x**7f_fff_ff_f");
         assert(ios.width() == 0);
@@ -273,7 +273,7 @@
         right(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "****1_00_0");
         assert(ios.width() == 0);
@@ -286,7 +286,7 @@
         left(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1_00_0****");
         assert(ios.width() == 0);
@@ -299,7 +299,7 @@
         internal(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "****1_00_0");
         assert(ios.width() == 0);
@@ -312,7 +312,7 @@
         showpos(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == (sizeof(unsigned long) == 4 ? "4_294_966_29_6"
                                                  : "18_446_744_073_709_550_61_6"));
@@ -325,7 +325,7 @@
         left(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == (sizeof(unsigned long) == 4 ? "4_294_966_29_6"
                                                  : "18_446_744_073_709_550_61_6"));
@@ -338,7 +338,7 @@
         internal(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == (sizeof(unsigned long) == 4 ? "4_294_966_29_6"
                                                  : "18_446_744_073_709_550_61_6"));
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
@@ -19,7 +19,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::num_put<char, output_iterator<char*> > F;
+typedef std::num_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -47,7 +47,7 @@
         std::ios ios(0);
         unsigned long long v = 0;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0");
     }
@@ -55,7 +55,7 @@
         std::ios ios(0);
         unsigned long long v = 1;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1");
     }
@@ -63,7 +63,7 @@
         std::ios ios(0);
         unsigned long long v = static_cast<unsigned long long>(-1);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "18446744073709551615");
     }
@@ -71,7 +71,7 @@
         std::ios ios(0);
         unsigned long long v = static_cast<unsigned long long>(-1000);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "18446744073709550616");
     }
@@ -79,7 +79,7 @@
         std::ios ios(0);
         unsigned long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1000");
     }
@@ -88,7 +88,7 @@
         showpos(ios);
         unsigned long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1000");
     }
@@ -97,7 +97,7 @@
         oct(ios);
         unsigned long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1750");
     }
@@ -107,7 +107,7 @@
         showbase(ios);
         unsigned long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "01750");
     }
@@ -116,7 +116,7 @@
         hex(ios);
         unsigned long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "3e8");
     }
@@ -126,7 +126,7 @@
         showbase(ios);
         unsigned long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x3e8");
     }
@@ -137,7 +137,7 @@
         uppercase(ios);
         unsigned long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0X3E8");
     }
@@ -149,7 +149,7 @@
         uppercase(ios);
         unsigned long long v = 1000;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0X3E_8");
     }
@@ -160,7 +160,7 @@
         showbase(ios);
         unsigned long long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x7f_fff_ff_f");
     }
@@ -170,7 +170,7 @@
         oct(ios);
         unsigned long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "123_46_7");
     }
@@ -181,7 +181,7 @@
         showbase(ios);
         unsigned long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0_123_46_7");
     }
@@ -194,7 +194,7 @@
         ios.width(15);
         unsigned long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "*****0_123_46_7");
     }
@@ -207,7 +207,7 @@
         ios.width(15);
         unsigned long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0_123_46_7*****");
     }
@@ -220,7 +220,7 @@
         ios.width(15);
         unsigned long long v = 0123467;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "*****0_123_46_7");
         assert(ios.width() == 0);
@@ -234,7 +234,7 @@
         ios.width(15);
         unsigned long long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "**0x7f_fff_ff_f");
     }
@@ -247,7 +247,7 @@
         ios.width(15);
         unsigned long long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x7f_fff_ff_f**");
     }
@@ -260,7 +260,7 @@
         ios.width(15);
         unsigned long long v = 2147483647;
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "0x**7f_fff_ff_f");
         assert(ios.width() == 0);
@@ -273,7 +273,7 @@
         right(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "****1_00_0");
         assert(ios.width() == 0);
@@ -286,7 +286,7 @@
         left(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "1_00_0****");
         assert(ios.width() == 0);
@@ -299,7 +299,7 @@
         internal(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "****1_00_0");
         assert(ios.width() == 0);
@@ -312,7 +312,7 @@
         showpos(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "18_446_744_073_709_550_61_6");
         assert(ios.width() == 0);
@@ -324,7 +324,7 @@
         left(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "18_446_744_073_709_550_61_6");
         assert(ios.width() == 0);
@@ -336,7 +336,7 @@
         internal(ios);
         ios.width(10);
         char str[50];
-        output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
+        cpp17_output_iterator<char*> iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', v);
         std::string ex(str, iter.base());
         assert(ex == "18_446_744_073_709_550_61_6");
         assert(ios.width() == 0);
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp
@@ -39,7 +39,7 @@
 
 #include "platform_support.h" // locale name macros
 
-typedef std::time_put_byname<char, output_iterator<char*> > F;
+typedef std::time_put_byname<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -52,7 +52,7 @@
 int main(int, char**)
 {
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     tm t;
     t.tm_sec = 6;
     t.tm_min = 3;
@@ -67,16 +67,14 @@
     {
         const my_facet f(LOCALE_en_US_UTF_8, 1);
         std::string pat("Today is %A which is abbreviated %a.");
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t,
-                     pat.data(), pat.data() + pat.size());
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, pat.data(), pat.data() + pat.size());
         std::string ex(str, iter.base());
         assert(ex == "Today is Saturday which is abbreviated Sat.");
     }
     {
         const my_facet f(LOCALE_fr_FR_UTF_8, 1);
         std::string pat("Today is %A which is abbreviated %a.");
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t,
-                     pat.data(), pat.data() + pat.size());
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, pat.data(), pat.data() + pat.size());
         std::string ex(str, iter.base());
         assert((ex == "Today is Samedi which is abbreviated Sam.")||
                (ex == "Today is samedi which is abbreviated sam." ));
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put1.pass.cpp
@@ -19,7 +19,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::time_put<char, output_iterator<char*> > F;
+typedef std::time_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -33,7 +33,7 @@
 {
     const my_facet f(1);
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     tm t;
     t.tm_sec = 6;
     t.tm_min = 3;
@@ -47,15 +47,13 @@
     std::ios ios(0);
     {
         std::string pat("Today is %A which is abbreviated %a.");
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t,
-                     pat.data(), pat.data() + pat.size());
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, pat.data(), pat.data() + pat.size());
         std::string ex(str, iter.base());
         assert(ex == "Today is Saturday which is abbreviated Sat.");
     }
     {
         std::string pat("The number of the month is %Om.");
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t,
-                     pat.data(), pat.data() + pat.size());
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, pat.data(), pat.data() + pat.size());
         std::string ex(str, iter.base());
         assert(ex == "The number of the month is 05.");
     }
diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
--- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.put/locale.time.put.members/put2.pass.cpp
@@ -18,7 +18,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-typedef std::time_put<char, output_iterator<char*> > F;
+typedef std::time_put<char, cpp17_output_iterator<char*> > F;
 
 class my_facet
     : public F
@@ -32,7 +32,7 @@
 {
     const my_facet f(1);
     char str[200];
-    output_iterator<char*> iter;
+    cpp17_output_iterator<char*> iter;
     tm t = {};
     t.tm_sec = 6;
     t.tm_min = 3;
@@ -45,277 +45,277 @@
     t.tm_isdst = 1;
     std::ios ios(0);
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'A');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'A');
         std::string ex(str, iter.base());
         assert(ex == "Saturday");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'a');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'a');
         std::string ex(str, iter.base());
         assert(ex == "Sat");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'B');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'B');
         std::string ex(str, iter.base());
         assert(ex == "May");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'b');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'b');
         std::string ex(str, iter.base());
         assert(ex == "May");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'C');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'C');
         std::string ex(str, iter.base());
         assert(ex == "20");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'c');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'c');
         std::string ex(str, iter.base());
         assert(ex == "Sat May  2 13:03:06 2009");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'D');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'D');
         std::string ex(str, iter.base());
         assert(ex == "05/02/09");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'd');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'd');
         std::string ex(str, iter.base());
         assert(ex == "02");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'c', 'E');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'c', 'E');
         std::string ex(str, iter.base());
         assert(ex == "Sat May  2 13:03:06 2009");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'C', 'E');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'C', 'E');
         std::string ex(str, iter.base());
         assert(ex == "20");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'x', 'E');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'x', 'E');
         std::string ex(str, iter.base());
         assert(ex == "05/02/09");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'X', 'E');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'X', 'E');
         std::string ex(str, iter.base());
         assert(ex == "13:03:06");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'y', 'E');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'y', 'E');
         std::string ex(str, iter.base());
         assert(ex == "09");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'Y', 'E');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'Y', 'E');
         std::string ex(str, iter.base());
         assert(ex == "2009");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'd', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'd', 'O');
         std::string ex(str, iter.base());
         assert(ex == "02");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'e', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'e', 'O');
         std::string ex(str, iter.base());
         assert(ex == " 2");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'H', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'H', 'O');
         std::string ex(str, iter.base());
         assert(ex == "13");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'I', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'I', 'O');
         std::string ex(str, iter.base());
         assert(ex == "01");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'm', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'm', 'O');
         std::string ex(str, iter.base());
         assert(ex == "05");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'M', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'M', 'O');
         std::string ex(str, iter.base());
         assert(ex == "03");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'S', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'S', 'O');
         std::string ex(str, iter.base());
         assert(ex == "06");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'u', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'u', 'O');
         std::string ex(str, iter.base());
         assert(ex == "6");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'U', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'U', 'O');
         std::string ex(str, iter.base());
         assert(ex == "17");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'V', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'V', 'O');
         std::string ex(str, iter.base());
         assert(ex == "18");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'w', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'w', 'O');
         std::string ex(str, iter.base());
         assert(ex == "6");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'W', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'W', 'O');
         std::string ex(str, iter.base());
         assert(ex == "17");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'y', 'O');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'y', 'O');
         std::string ex(str, iter.base());
         assert(ex == "09");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'e');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'e');
         std::string ex(str, iter.base());
         assert(ex == " 2");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'F');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'F');
         std::string ex(str, iter.base());
         assert(ex == "2009-05-02");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'G');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'G');
         std::string ex(str, iter.base());
         assert(ex == "2009");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'g');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'g');
         std::string ex(str, iter.base());
         assert(ex == "09");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'H');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'H');
         std::string ex(str, iter.base());
         assert(ex == "13");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'h');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'h');
         std::string ex(str, iter.base());
         assert(ex == "May");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'I');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'I');
         std::string ex(str, iter.base());
         assert(ex == "01");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'j');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'j');
         std::string ex(str, iter.base());
         assert(ex == "122");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'M');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'M');
         std::string ex(str, iter.base());
         assert(ex == "03");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'm');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'm');
         std::string ex(str, iter.base());
         assert(ex == "05");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'n');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'n');
         std::string ex(str, iter.base());
         assert(ex == "\n");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'p');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'p');
         std::string ex(str, iter.base());
         assert(ex == "PM");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'R');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'R');
         std::string ex(str, iter.base());
         assert(ex == "13:03");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'r');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'r');
         std::string ex(str, iter.base());
         assert(ex == "01:03:06 PM");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'S');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'S');
         std::string ex(str, iter.base());
         assert(ex == "06");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'T');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'T');
         std::string ex(str, iter.base());
         assert(ex == "13:03:06");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 't');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 't');
         std::string ex(str, iter.base());
         assert(ex == "\t");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'U');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'U');
         std::string ex(str, iter.base());
         assert(ex == "17");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'u');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'u');
         std::string ex(str, iter.base());
         assert(ex == "6");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'V');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'V');
         std::string ex(str, iter.base());
         assert(ex == "18");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'W');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'W');
         std::string ex(str, iter.base());
         assert(ex == "17");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'w');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'w');
         std::string ex(str, iter.base());
         assert(ex == "6");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'X');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'X');
         std::string ex(str, iter.base());
         assert(ex == "13:03:06");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'x');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'x');
         std::string ex(str, iter.base());
         assert(ex == "05/02/09");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'Y');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'Y');
         std::string ex(str, iter.base());
         assert(ex == "2009");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'y');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'y');
         std::string ex(str, iter.base());
         assert(ex == "09");
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'Z');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'Z');
         std::string ex(str, iter.base());
 //        assert(ex == "EDT");  depends on time zone
     }
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, 'z');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, 'z');
         std::string ex(str, iter.base());
 //        assert(ex == "-0400");  depends on time zone
     }
@@ -323,13 +323,13 @@
     // The Windows strftime() doesn't support the "%+" format. Depending on CRT
     // configuration of the invalid parameter handler, this can abort the process.
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, '+');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, '+');
         std::string ex(str, iter.base());
 //        assert(ex == "Sat May  2 13:03:06 EDT 2009");  depends on time zone
     }
 #endif
     {
-        iter = f.put(output_iterator<char*>(str), ios, '*', &t, '%');
+        iter = f.put(cpp17_output_iterator<char*>(str), ios, '*', &t, '%');
         std::string ex(str, iter.base());
         assert(ex == "%");
     }
diff --git a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
--- a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference.pass.cpp
@@ -79,31 +79,31 @@
 TEST_CONSTEXPR_CXX20 bool
 test()
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
--- a/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/adjacent.difference/adjacent_difference_op.pass.cpp
@@ -140,31 +140,31 @@
 TEST_CONSTEXPR_CXX20 bool
 test()
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp b/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
--- a/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum.pass.cpp
@@ -40,31 +40,31 @@
 TEST_CONSTEXPR_CXX20 bool
 test()
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
--- a/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/partial.sum/partial_sum_op.pass.cpp
@@ -100,31 +100,31 @@
 TEST_CONSTEXPR_CXX20 bool
 test()
 {
-    test<cpp17_input_iterator<const int*>, output_iterator<int*> >();
+    test<cpp17_input_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, forward_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, bidirectional_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, random_access_iterator<int*> >();
     test<cpp17_input_iterator<const int*>, int*>();
 
-    test<forward_iterator<const int*>, output_iterator<int*> >();
+    test<forward_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<forward_iterator<const int*>, forward_iterator<int*> >();
     test<forward_iterator<const int*>, bidirectional_iterator<int*> >();
     test<forward_iterator<const int*>, random_access_iterator<int*> >();
     test<forward_iterator<const int*>, int*>();
 
-    test<bidirectional_iterator<const int*>, output_iterator<int*> >();
+    test<bidirectional_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<bidirectional_iterator<const int*>, forward_iterator<int*> >();
     test<bidirectional_iterator<const int*>, bidirectional_iterator<int*> >();
     test<bidirectional_iterator<const int*>, random_access_iterator<int*> >();
     test<bidirectional_iterator<const int*>, int*>();
 
-    test<random_access_iterator<const int*>, output_iterator<int*> >();
+    test<random_access_iterator<const int*>, cpp17_output_iterator<int*> >();
     test<random_access_iterator<const int*>, forward_iterator<int*> >();
     test<random_access_iterator<const int*>, bidirectional_iterator<int*> >();
     test<random_access_iterator<const int*>, random_access_iterator<int*> >();
     test<random_access_iterator<const int*>, int*>();
 
-    test<const int*, output_iterator<int*> >();
+    test<const int*, cpp17_output_iterator<int*> >();
     test<const int*, forward_iterator<int*> >();
     test<const int*, bidirectional_iterator<int*> >();
     test<const int*, random_access_iterator<int*> >();
diff --git a/libcxx/test/std/ranges/range.adaptors/range.counted/counted.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.counted/counted.pass.cpp
--- a/libcxx/test/std/ranges/range.adaptors/range.counted/counted.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.counted/counted.pass.cpp
@@ -171,12 +171,12 @@
   }
 
   {
-    auto it = output_iterator<int*>(buffer);
+    auto it = cpp17_output_iterator<int*>(buffer);
 
     auto c1 = std::views::counted(it, 3);
     auto c2 = std::views::counted(std::as_const(it), 3);
     auto c3 = std::views::counted(std::move(it), 3);
-    auto c4 = std::views::counted(output_iterator<int*>(buffer), 3);
+    auto c4 = std::views::counted(cpp17_output_iterator<int*>(buffer), 3);
 
     using Expected = std::ranges::subrange<std::counted_iterator<decltype(it)>, std::default_sentinel_t>;
 
diff --git a/libcxx/test/std/ranges/range.req/range.refinements/output_range.compile.pass.cpp b/libcxx/test/std/ranges/range.req/range.refinements/output_range.compile.pass.cpp
--- a/libcxx/test/std/ranges/range.req/range.refinements/output_range.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.req/range.refinements/output_range.compile.pass.cpp
@@ -23,7 +23,7 @@
 
 // Satisfied when it's a range and has the right iterator
 struct GoodRange {
-    output_iterator<T*> begin();
+    cpp17_output_iterator<T*> begin();
     sentinel end();
 };
 static_assert(std::ranges::range<GoodRange>);
@@ -32,7 +32,7 @@
 
 // Not satisfied when it's not a range
 struct NotRange {
-    output_iterator<T*> begin();
+    cpp17_output_iterator<T*> begin();
 };
 static_assert(!std::ranges::range<NotRange>);
 static_assert( std::output_iterator<std::ranges::iterator_t<NotRange>, T>);
diff --git a/libcxx/test/std/re/re.alg/re.alg.replace/test1.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.replace/test1.pass.cpp
--- a/libcxx/test/std/re/re.alg/re.alg.replace/test1.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.replace/test1.pass.cpp
@@ -29,7 +29,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -41,7 +41,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -54,7 +54,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -67,7 +67,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -80,7 +80,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -93,7 +93,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
diff --git a/libcxx/test/std/re/re.alg/re.alg.replace/test2.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.replace/test2.pass.cpp
--- a/libcxx/test/std/re/re.alg/re.alg.replace/test2.pass.cpp
+++ b/libcxx/test/std/re/re.alg/re.alg.replace/test2.pass.cpp
@@ -29,7 +29,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -41,7 +41,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -54,7 +54,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -67,7 +67,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -80,7 +80,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
@@ -93,7 +93,7 @@
     {
         std::regex phone_numbers("\\d{3}-\\d{4}");
         const char phone_book[] = "555-1234, 555-2345, 555-3456";
-        typedef output_iterator<char*> Out;
+        typedef cpp17_output_iterator<char*> Out;
         typedef bidirectional_iterator<const char*> Bi;
         char buf[100] = {0};
         Out r = std::regex_replace(Out(buf), Bi(std::begin(phone_book)),
diff --git a/libcxx/test/std/re/re.results/re.results.form/form1.pass.cpp b/libcxx/test/std/re/re.results/re.results.form/form1.pass.cpp
--- a/libcxx/test/std/re/re.results/re.results.form/form1.pass.cpp
+++ b/libcxx/test/std/re/re.results/re.results.form/form1.pass.cpp
@@ -30,7 +30,7 @@
 
         char out[100] = {0};
         const char fmt[] = "prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2";
-        char* r = m.format(output_iterator<char*>(out),
+        char* r = m.format(cpp17_output_iterator<char*>(out),
                     fmt, fmt + std::char_traits<char>::length(fmt)).base();
         assert(r == out + 58);
         assert(std::string(out) == "prefix: ab, match: cdefghi, suffix: jk, m[1]: efg, m[2]: e");
@@ -43,7 +43,7 @@
 
         char out[100] = {0};
         const char fmt[] = "prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2";
-        char* r = m.format(output_iterator<char*>(out),
+        char* r = m.format(cpp17_output_iterator<char*>(out),
                     fmt, fmt + std::char_traits<char>::length(fmt)).base();
         assert(r == out + 54);
         assert(std::string(out) == "prefix: ab, match: cdefghi, suffix: jk, m[1]: , m[2]: ");
@@ -55,7 +55,7 @@
 
         char out[100] = {0};
         const char fmt[] = "prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2";
-        char* r = m.format(output_iterator<char*>(out),
+        char* r = m.format(cpp17_output_iterator<char*>(out),
                     fmt, fmt + std::char_traits<char>::length(fmt)).base();
         assert(r == out + 54);
         assert(std::string(out) == "prefix: ab, match: cdefghi, suffix: jk, m[1]: , m[2]: ");
@@ -67,7 +67,7 @@
 
         char out[100] = {0};
         const char fmt[] = "prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2";
-        char* r = m.format(output_iterator<char*>(out),
+        char* r = m.format(cpp17_output_iterator<char*>(out),
                     fmt, fmt + std::char_traits<char>::length(fmt),
                     std::regex_constants::format_sed).base();
         assert(r == out + 59);
@@ -80,7 +80,7 @@
 
         char out[100] = {0};
         const char fmt[] = "match: &, m[1]: \\1, m[2]: \\2";
-        char* r = m.format(output_iterator<char*>(out),
+        char* r = m.format(cpp17_output_iterator<char*>(out),
                     fmt, fmt + std::char_traits<char>::length(fmt),
                     std::regex_constants::format_sed).base();
         assert(r == out + 34);
@@ -94,7 +94,7 @@
 
         char out[100] = {0};
         const char fmt[] = "match: &, m[1]: \\1, m[2]: \\2";
-        char* r = m.format(output_iterator<char*>(out),
+        char* r = m.format(cpp17_output_iterator<char*>(out),
                     fmt, fmt + std::char_traits<char>::length(fmt),
                     std::regex_constants::format_sed).base();
         assert(r == out + 30);
@@ -107,7 +107,7 @@
 
         char out[100] = {0};
         const char fmt[] = "match: &, m[1]: \\1, m[2]: \\2";
-        char* r = m.format(output_iterator<char*>(out),
+        char* r = m.format(cpp17_output_iterator<char*>(out),
                     fmt, fmt + std::char_traits<char>::length(fmt),
                     std::regex_constants::format_sed).base();
         assert(r == out + 30);
@@ -122,7 +122,7 @@
 
         wchar_t out[100] = {0};
         const wchar_t fmt[] = L"prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2";
-        wchar_t* r = m.format(output_iterator<wchar_t*>(out),
+        wchar_t* r = m.format(cpp17_output_iterator<wchar_t*>(out),
                     fmt, fmt + std::char_traits<wchar_t>::length(fmt)).base();
         assert(r == out + 58);
         assert(std::wstring(out) == L"prefix: ab, match: cdefghi, suffix: jk, m[1]: efg, m[2]: e");
@@ -134,7 +134,7 @@
 
         wchar_t out[100] = {0};
         const wchar_t fmt[] = L"prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2";
-        wchar_t* r = m.format(output_iterator<wchar_t*>(out),
+        wchar_t* r = m.format(cpp17_output_iterator<wchar_t*>(out),
                     fmt, fmt + std::char_traits<wchar_t>::length(fmt),
                     std::regex_constants::format_sed).base();
         assert(r == out + 59);
@@ -147,7 +147,7 @@
 
         wchar_t out[100] = {0};
         const wchar_t fmt[] = L"match: &, m[1]: \\1, m[2]: \\2";
-        wchar_t* r = m.format(output_iterator<wchar_t*>(out),
+        wchar_t* r = m.format(cpp17_output_iterator<wchar_t*>(out),
                     fmt, fmt + std::char_traits<wchar_t>::length(fmt),
                     std::regex_constants::format_sed).base();
         assert(r == out + 34);
diff --git a/libcxx/test/std/re/re.results/re.results.form/form2.pass.cpp b/libcxx/test/std/re/re.results/re.results.form/form2.pass.cpp
--- a/libcxx/test/std/re/re.results/re.results.form/form2.pass.cpp
+++ b/libcxx/test/std/re/re.results/re.results.form/form2.pass.cpp
@@ -32,7 +32,7 @@
 
         char out[100] = {0};
         nstr fmt("prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2");
-        char* r = m.format(output_iterator<char*>(out), fmt).base();
+        char* r = m.format(cpp17_output_iterator<char*>(out), fmt).base();
         assert(r == out + 58);
         assert(std::string(out) == "prefix: ab, match: cdefghi, suffix: jk, m[1]: efg, m[2]: e");
     }
@@ -43,7 +43,7 @@
 
         char out[100] = {0};
         nstr fmt("prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2");
-        char* r = m.format(output_iterator<char*>(out),
+        char* r = m.format(cpp17_output_iterator<char*>(out),
                     fmt, std::regex_constants::format_sed).base();
         assert(r == out + 59);
         assert(std::string(out) == "prefix: $`, match: $cdefghi, suffix: $', m[1]: $1, m[2]: $2");
@@ -55,7 +55,7 @@
 
         char out[100] = {0};
         nstr fmt("match: &, m[1]: \\1, m[2]: \\2");
-        char* r = m.format(output_iterator<char*>(out),
+        char* r = m.format(cpp17_output_iterator<char*>(out),
                     fmt, std::regex_constants::format_sed).base();
         assert(r == out + 34);
         assert(std::string(out) == "match: cdefghi, m[1]: efg, m[2]: e");
@@ -70,7 +70,7 @@
 
         wchar_t out[100] = {0};
         wstr fmt(L"prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2");
-        wchar_t* r = m.format(output_iterator<wchar_t*>(out), fmt).base();
+        wchar_t* r = m.format(cpp17_output_iterator<wchar_t*>(out), fmt).base();
         assert(r == out + 58);
         assert(std::wstring(out) == L"prefix: ab, match: cdefghi, suffix: jk, m[1]: efg, m[2]: e");
     }
@@ -81,7 +81,7 @@
 
         wchar_t out[100] = {0};
         wstr fmt(L"prefix: $`, match: $&, suffix: $', m[1]: $1, m[2]: $2");
-        wchar_t* r = m.format(output_iterator<wchar_t*>(out),
+        wchar_t* r = m.format(cpp17_output_iterator<wchar_t*>(out),
                     fmt, std::regex_constants::format_sed).base();
         assert(r == out + 59);
         assert(std::wstring(out) == L"prefix: $`, match: $cdefghi, suffix: $', m[1]: $1, m[2]: $2");
@@ -93,7 +93,7 @@
 
         wchar_t out[100] = {0};
         wstr fmt(L"match: &, m[1]: \\1, m[2]: \\2");
-        wchar_t* r = m.format(output_iterator<wchar_t*>(out),
+        wchar_t* r = m.format(cpp17_output_iterator<wchar_t*>(out),
                     fmt, std::regex_constants::format_sed).base();
         assert(r == out + 34);
         assert(std::wstring(out) == L"match: cdefghi, m[1]: efg, m[2]: e");
diff --git a/libcxx/test/support/test_iterators.h b/libcxx/test/support/test_iterators.h
--- a/libcxx/test/support/test_iterators.h
+++ b/libcxx/test/support/test_iterators.h
@@ -17,12 +17,15 @@
 
 #include "test_macros.h"
 
+// This is the Cpp17OutputIterator requirement as described in Table 90 ([output.iterators]),
+// formerly known as OutputIterator prior to C++20. Note in C++20 these iterators are still
+// named OutputIterator in several places. For example the 25.2 [algorithms.requirements].
 template <class It>
-class output_iterator
+class cpp17_output_iterator
 {
     It it_;
 
-    template <class U> friend class output_iterator;
+    template <class U> friend class cpp17_output_iterator;
 public:
     typedef          std::output_iterator_tag                  iterator_category;
     typedef void                                               value_type;
@@ -30,25 +33,26 @@
     typedef It                                                 pointer;
     typedef typename std::iterator_traits<It>::reference       reference;
 
-    TEST_CONSTEXPR output_iterator() : it_() {}
-    TEST_CONSTEXPR explicit output_iterator(It it) : it_(std::move(it)) {}
+    TEST_CONSTEXPR cpp17_output_iterator() : it_() {}
+    TEST_CONSTEXPR explicit cpp17_output_iterator(It it) : it_(std::move(it)) {}
     template <class U>
-        TEST_CONSTEXPR output_iterator(const output_iterator<U>& u) : it_(u.it_) {}
+        TEST_CONSTEXPR cpp17_output_iterator(const cpp17_output_iterator<U>& u) :it_(u.it_) {}
 
     TEST_CONSTEXPR reference operator*() const {return *it_;}
 
-    TEST_CONSTEXPR_CXX14 output_iterator& operator++() {++it_; return *this;}
-    TEST_CONSTEXPR_CXX14 output_iterator operator++(int) {return output_iterator(it_++);}
+    TEST_CONSTEXPR_CXX14 cpp17_output_iterator& operator++() {++it_; return *this;}
+    TEST_CONSTEXPR_CXX14 cpp17_output_iterator operator++(int) {return cpp17_output_iterator(it_++);}
 
     TEST_CONSTEXPR It base() const {return it_;} // TODO remove me
-    friend TEST_CONSTEXPR It base(const output_iterator& i) { return i.it_; }
+    friend TEST_CONSTEXPR It base(const cpp17_output_iterator& i) { return i.it_; }
 
     template <class T>
     void operator,(T const &) = delete;
 };
 
 // This is the Cpp17InputIterator requirement as described in Table 87 ([input.iterators]),
-// formerly known as InputIterator prior to C++20.
+// formerly known as InputIterator prior to C++20. Note in C++20 these iterators are still
+// named InputIterator in several places. For example the 25.2 [algorithms.requirements].
 template <class It, class ItTraits = It>
 class cpp17_input_iterator
 {