From 7dcf05108edb95da8a32c6bbbae447b9c6e650af Mon Sep 17 00:00:00 2001
From: vitaut <victor.zverovich@gmail.com>
Date: Fri, 13 Nov 2015 06:52:13 -0800
Subject: [PATCH] Move cstddef include to format.cc and refactor Buffer::append

---
 format.cc |  5 +++--
 format.h  | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/format.cc b/format.cc
index ee3224bc..88801fc0 100644
--- a/format.cc
+++ b/format.cc
@@ -34,6 +34,7 @@
 #include <climits>
 #include <cmath>
 #include <cstdarg>
+#include <cstddef>  // for std::ptrdiff_t
 
 #if defined(_WIN32) && defined(__MINGW32__)
 # include <cstring>
@@ -1040,10 +1041,10 @@ void fmt::internal::PrintfFormatter<Char>::format(
       ArgConverter<intmax_t>(arg, *s).visit(arg);
       break;
     case 'z':
-      ArgConverter<size_t>(arg, *s).visit(arg);
+      ArgConverter<std::size_t>(arg, *s).visit(arg);
       break;
     case 't':
-      ArgConverter<ptrdiff_t>(arg, *s).visit(arg);
+      ArgConverter<std::ptrdiff_t>(arg, *s).visit(arg);
       break;
     case 'L':
       // printf produces garbage when 'L' is omitted for long double, no
diff --git a/format.h b/format.h
index 36bc0109..35dac05b 100644
--- a/format.h
+++ b/format.h
@@ -32,7 +32,6 @@
 
 #include <cassert>
 #include <cmath>
-#include <cstddef>  // for std::ptrdiff_t
 #include <cstdio>
 #include <algorithm>
 #include <limits>
@@ -484,11 +483,12 @@ class Buffer {
 template <typename T>
 template <typename U>
 void Buffer<T>::append(const U *begin, const U *end) {
-  std::ptrdiff_t num_elements = end - begin;
-  if (size_ + num_elements > capacity_)
-    grow(size_ + num_elements);
+  assert(begin <= end);
+  std::size_t new_size = size_ + (end - begin);
+  if (new_size > capacity_)
+    grow(new_size);
   std::copy(begin, end, internal::make_ptr(ptr_, capacity_) + size_);
-  size_ += num_elements;
+  size_ = new_size;
 }
 
 namespace internal {