From 1bd2d04c2e76f0eed41507d830070e2499b1290d Mon Sep 17 00:00:00 2001
From: Neil MacIntosh <neilmac@microsoft.com>
Date: Mon, 1 Aug 2016 13:10:02 -0700
Subject: [PATCH] Another round of clang-formatting.

---
 include/multi_span.h  | 10 +++++-----
 include/span.h        |  6 +++++-
 include/string_span.h |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/multi_span.h b/include/multi_span.h
index e35fc33..a8a1af2 100644
--- a/include/multi_span.h
+++ b/include/multi_span.h
@@ -1594,13 +1594,12 @@ public:
 // Free functions for manipulating spans
 //
 
-
 // reshape a multi_span into a different dimensionality
 // DimCount and Enabled here are workarounds for a bug in MSVC 2015
 template <typename SpanType, typename... Dimensions2, size_t DimCount = sizeof...(Dimensions2),
-          bool Enabled = (DimCount > 0), typename = std::enable_if_t<Enabled> >
-constexpr auto
-as_multi_span(SpanType s, Dimensions2... dims) -> multi_span<typename SpanType::value_type, Dimensions2::value...>
+          bool Enabled = (DimCount > 0), typename = std::enable_if_t<Enabled>>
+constexpr auto as_multi_span(SpanType s, Dimensions2... dims)
+    -> multi_span<typename SpanType::value_type, Dimensions2::value...>
 {
     static_assert(details::is_multi_span<SpanType>::value,
                   "Variadic as_multi_span() is for reshaping existing spans.");
@@ -1687,7 +1686,8 @@ constexpr auto as_multi_span(T* const& ptr, dim<Dimensions>... args)
     -> multi_span<std::remove_all_extents_t<T>, Dimensions...>
 {
     return {reinterpret_cast<std::remove_all_extents_t<T>*>(ptr),
-            details::static_as_multi_span_helper<static_bounds<Dimensions...>>(args..., details::Sep{})};
+            details::static_as_multi_span_helper<static_bounds<Dimensions...>>(args...,
+                                                                               details::Sep{})};
 }
 
 template <typename T>
diff --git a/include/span.h b/include/span.h
index 44e1b8d..98e08fd 100644
--- a/include/span.h
+++ b/include/span.h
@@ -579,7 +579,11 @@ public:
 #ifndef GSL_MSVC_NO_DEFAULT_MOVE_CTOR
     constexpr span& operator=(span&& other) noexcept = default;
 #else
-    constexpr span& operator=(span&& other) noexcept { storage_ = std::move(other.storage_); return *this; }
+    constexpr span& operator=(span&& other) noexcept
+    {
+        storage_ = std::move(other.storage_);
+        return *this;
+    }
 #endif
     // [span.sub], span subviews
     template <std::ptrdiff_t Count>
diff --git a/include/string_span.h b/include/string_span.h
index 3fe826f..e18e07a 100644
--- a/include/string_span.h
+++ b/include/string_span.h
@@ -22,9 +22,9 @@
 #include "gsl_assert.h"
 #include "gsl_util.h"
 #include "span.h"
+#include <cstdint>
 #include <cstring>
 #include <string>
-#include <cstdint>
 
 #ifdef _MSC_VER