From 31ea064e417439204d31937d7a3d2acbad1b49df Mon Sep 17 00:00:00 2001
From: Matthew Parnell <matt@parnmatt.co.uk>
Date: Wed, 4 Dec 2019 17:28:39 +0000
Subject: [PATCH] Avoid usage of begin/end for member variables in format.h

As with parent commit, begin and  end are commonly member functions, not
member variables. To  fit in with the style of  the project, `first` and
`last` have been used as an alternative within the `arg_join` struct.

`begin()` and  `end()` member functions  have been added to  the struct,
and  the  calling  code   modified;  thus  increasing  consistency  with
surrounding code.
---
 include/fmt/format.h | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/include/fmt/format.h b/include/fmt/format.h
index 600b0eba..3092aa9b 100644
--- a/include/fmt/format.h
+++ b/include/fmt/format.h
@@ -33,8 +33,6 @@
 #ifndef FMT_FORMAT_H_
 #define FMT_FORMAT_H_
 
-#include "core.h"
-
 #include <algorithm>
 #include <cerrno>
 #include <cmath>
@@ -43,6 +41,8 @@
 #include <memory>
 #include <stdexcept>
 
+#include "core.h"
+
 #ifdef __clang__
 #  define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
 #else
@@ -3217,12 +3217,15 @@ template <typename T> inline const void* ptr(const std::shared_ptr<T>& p) {
   return p.get();
 }
 
-template <typename It, typename Char> struct arg_join : internal::view {
-  It begin;
-  It end;
+template <typename It, typename Char>
+struct arg_join : internal::view {
+  It first;
+  It last;
   basic_string_view<Char> sep;
 
-  arg_join(It b, It e, basic_string_view<Char> s) : begin(b), end(e), sep(s) {}
+  arg_join(It b, It e, basic_string_view<Char> s) : first(b), last(e), sep(s) {}
+  It begin() const { return first; }
+  It end() const { return last; }
 };
 
 template <typename It, typename Char>
@@ -3232,11 +3235,11 @@ struct formatter<arg_join<It, Char>, Char>
   auto format(const arg_join<It, Char>& value, FormatContext& ctx)
       -> decltype(ctx.out()) {
     using base = formatter<typename std::iterator_traits<It>::value_type, Char>;
-    auto it = value.begin;
+    auto it = value.begin();
     auto out = ctx.out();
-    if (it != value.end) {
+    if (it != value.end()) {
       out = base::format(*it++, ctx);
-      while (it != value.end) {
+      while (it != value.end()) {
         out = std::copy(value.sep.begin(), value.sep.end(), out);
         ctx.advance_to(out);
         out = base::format(*it++, ctx);
@@ -3272,14 +3275,14 @@ arg_join<It, wchar_t> join(It begin, It end, wstring_view sep) {
   \endrst
  */
 template <typename Range>
-arg_join<internal::iterator_t<const Range>, char> join(const Range& range,
-                                                       string_view sep) {
+arg_join<internal::iterator_t<const Range>, char>
+join(const Range& range, string_view sep) {
   return join(std::begin(range), std::end(range), sep);
 }
 
 template <typename Range>
-arg_join<internal::iterator_t<const Range>, wchar_t> join(const Range& range,
-                                                          wstring_view sep) {
+arg_join<internal::iterator_t<const Range>, wchar_t>
+join(const Range& range, wstring_view sep) {
   return join(std::begin(range), std::end(range), sep);
 }