From f8d1e96ae7ac9a3483ff0a214796455946d7880f Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Wed, 3 Sep 2014 16:25:45 -0700
Subject: Use static casts instead of C casts, add floor-cast functions

---
 src/Globals.h | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

(limited to 'src/Globals.h')

diff --git a/src/Globals.h b/src/Globals.h
index 0926457da..8bf7a0f0c 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -226,10 +226,10 @@ template class SizeChecker<UInt16, 2>;
 
 // CRT stuff:
 #include <sys/stat.h>
-#include <assert.h>
-#include <stdio.h>
-#include <math.h>
-#include <stdarg.h>
+#include <cassert>
+#include <cstdio>
+#include <cmath>
+#include <cstdarg>
 
 
 
@@ -400,6 +400,38 @@ T Clamp(T a_Value, T a_Min, T a_Max)
 
 
 
+/** Floors a_Value, then casts it to C (an int by default) */
+template <typename C = int>
+C FloorD(double a_Value)
+{
+	return static_cast<C>(std::floor(a_Value));
+}
+
+/** Floors a_Value, then casts it to C (an int by default) */
+template <typename C = int>
+C FloorF(double a_Value)
+{
+	return static_cast<C>(std::floorf(a_Value));
+}
+
+/** Ciels a_Value, then casts it to C (an int by default) */
+template <typename C = int>
+C CeilD(double a_Value)
+{
+	return static_cast<C>(std::ceil(a_Value));
+}
+
+/** Ciels a_Value, then casts it to C (an int by default) */
+template <typename C = int>
+C CeilF(double a_Value)
+{
+	return static_cast<C>(std::ceilf(a_Value));
+}
+
+
+
+
+
 #ifndef TOLUA_TEMPLATE_BIND
 	#define TOLUA_TEMPLATE_BIND(x)
 #endif
-- 
cgit v1.2.3


From 76b37acb421bf10e094182b2e9be111eb29c46f1 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Wed, 3 Sep 2014 16:51:38 -0700
Subject: Float/Ciel: If it's going to use C++11, it might as well take
 advantage of it

---
 src/Globals.h | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'src/Globals.h')

diff --git a/src/Globals.h b/src/Globals.h
index 8bf7a0f0c..9959d92a9 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -400,34 +400,20 @@ T Clamp(T a_Value, T a_Min, T a_Max)
 
 
 
-/** Floors a_Value, then casts it to C (an int by default) */
-template <typename C = int>
-C FloorD(double a_Value)
+/** Floors a value, then casts it to C (an int by default) */
+template <typename C = int, typename T>
+typename std::enable_if<std::is_arithmetic<T>::value, C>::type FloorC(T a_Value)
 {
 	return static_cast<C>(std::floor(a_Value));
 }
 
-/** Floors a_Value, then casts it to C (an int by default) */
-template <typename C = int>
-C FloorF(double a_Value)
-{
-	return static_cast<C>(std::floorf(a_Value));
-}
-
-/** Ciels a_Value, then casts it to C (an int by default) */
-template <typename C = int>
-C CeilD(double a_Value)
+/** Ceils a value, then casts it to C (an int by default) */
+template <typename C = int, typename T>
+typename std::enable_if<std::is_arithmetic<T>::value, C>::type CeilC(T a_Value)
 {
 	return static_cast<C>(std::ceil(a_Value));
 }
 
-/** Ciels a_Value, then casts it to C (an int by default) */
-template <typename C = int>
-C CeilF(double a_Value)
-{
-	return static_cast<C>(std::ceilf(a_Value));
-}
-
 
 
 
-- 
cgit v1.2.3