From 4799f66d167ea3d008fb6ce87e87490e54921f3f Mon Sep 17 00:00:00 2001
From: hsutter <herb.sutter@gmail.com>
Date: Thu, 29 Sep 2016 12:59:21 -0700
Subject: [PATCH] Constexpr workaround

MSVC 2015 Update 3 doesn't yet like the auto const variable in a
constexpr function, removed the variable.
---
 util.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/util.h b/util.h
index c57f256..81c4fbe 100644
--- a/util.h
+++ b/util.h
@@ -25,7 +25,7 @@
 #endif
 
 //	This project requires GSL, see: https://github.com/microsoft/gsl
-#include <gsl/gsl>
+#include "gsl/gsl"
 #include <limits>
 #include <type_traits>
 
@@ -49,10 +49,9 @@ bool operator>=(const Type& that) const { return compare3(that) >= 0; }
 template<class Target, class Value>
 constexpr bool in_representable_range(Value const& value) {
 	using C = std::common_type_t<Target, Value>;
-	auto const cvalue = static_cast<C>(value);
-	return cvalue <= static_cast<C>(std::numeric_limits<Target>::max()) &&
-		(!std::is_signed<C>::value || static_cast<C>(std::numeric_limits<Target>::min()) <= cvalue) &&
-		(C{} < cvalue) == (Value{} < value);
+	return static_cast<C>(value) <= static_cast<C>(std::numeric_limits<Target>::max()) &&
+		(!std::is_signed<C>::value || static_cast<C>(std::numeric_limits<Target>::min()) <= static_cast<C>(value)) &&
+		(C{} < static_cast<C>(value)) == (Value{} < value);
 }
 
 #endif