More iteratification

test/util-test.cc

@@ -81,9 +81,10 @@ struct formatter<Test, Char> {
     return ctx.begin();
   }
 
-  using range = fmt::back_insert_range<basic_buffer<Char>>;
+  using iterator = std::back_insert_iterator<basic_buffer<Char>>;
 
-  auto format(Test, basic_context<range> &ctx) -> decltype(ctx.begin()) {
+  auto format(Test, basic_context<iterator, char> &ctx)
+      -> decltype(ctx.begin()) {
     const Char *test = "test";
     return std::copy_n(test, std::strlen(test), ctx.begin());
   }
@@ -521,8 +522,8 @@ VISIT_TYPE(float, double);
 #define CHECK_ARG_(Char, expected, value) { \
   testing::StrictMock<MockVisitor<decltype(expected)>> visitor; \
   EXPECT_CALL(visitor, visit(expected)); \
-  using range = fmt::back_insert_range<basic_buffer<Char>>; \
-  fmt::visit(visitor, make_arg<fmt::basic_context<range>>(value)); \
+  using iterator = std::back_insert_iterator<basic_buffer<Char>>; \
+  fmt::visit(visitor, make_arg<fmt::basic_context<iterator, Char>>(value)); \
 }
 
 #define CHECK_ARG(value) { \
@@ -600,7 +601,8 @@ TEST(UtilTest, CustomArg) {
   testing::StrictMock<visitor> v;
   EXPECT_CALL(v, visit(_)).WillOnce(testing::Invoke([&](handle h) {
     fmt::memory_buffer buffer;
-    fmt::context ctx(buffer, "", fmt::format_args());
+    fmt::internal::basic_buffer<char> &base = buffer;
+    fmt::context ctx(std::back_inserter(base), "", fmt::format_args());
     h.format(ctx);
     EXPECT_EQ("test", std::string(buffer.data(), buffer.size()));
     return visitor::Result();