From ec7821681345b96c9dbb090505993aaff29c5a62 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Tue, 25 Oct 2016 17:46:36 +1100
Subject: [PATCH] coord: prefer int/unsigned to intmax/size_t

---
 extent.hpp    | 10 +++++-----
 geom/aabb.hpp |  8 ++++----
 point.hpp     | 16 ++++++++--------
 region.hpp    |  4 ++--
 vector.hpp    | 12 ++++++------
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/extent.hpp b/extent.hpp
index 50cbecbd..e983d74a 100644
--- a/extent.hpp
+++ b/extent.hpp
@@ -86,17 +86,17 @@ namespace util {
     template <typename T> using extent2 = extent<2,T>;
     template <typename T> using extent3 = extent<3,T>;
 
-    template <size_t S> using extentu = extent<S,size_t>;
-    template <size_t S> using extenti = extent<S,intmax_t>;
+    template <size_t S> using extentu = extent<S,unsigned>;
+    template <size_t S> using extenti = extent<S,int>;
     template <size_t S> using extentf = extent<S,float>;
     template <size_t S> using extentd = extent<S,double>;
 
-    typedef extent2<intmax_t> extent2i;
-    typedef extent2<size_t> extent2u;
+    typedef extent2<int> extent2i;
+    typedef extent2<unsigned> extent2u;
     typedef extent2<float> extent2f;
     typedef extent2<double> extent2d;
 
-    typedef extent3<size_t> extent3u;
+    typedef extent3<unsigned> extent3u;
     typedef extent3<float> extent3f;
 
     template <typename T> using extent_range2 = extent_range<2,T>;
diff --git a/geom/aabb.hpp b/geom/aabb.hpp
index 583455be..6dd18392 100644
--- a/geom/aabb.hpp
+++ b/geom/aabb.hpp
@@ -58,12 +58,12 @@ namespace util { namespace geom {
     };
 
     typedef AABB<2,float> AABB2f;
-    typedef AABB<2,size_t> AABB2u;
-    typedef AABB<2,intmax_t> AABB2i;
+    typedef AABB<2,unsigned> AABB2u;
+    typedef AABB<2,int> AABB2i;
 
     typedef AABB<3,float> AABB3f;
-    typedef AABB<3,size_t> AABB3u;
-    typedef AABB<3,intmax_t> AABB3i;
+    typedef AABB<3,unsigned> AABB3u;
+    typedef AABB<3,int> AABB3i;
 } }
 
 #include "aabb.ipp"
diff --git a/point.hpp b/point.hpp
index d3cda6aa..8b40a5b3 100644
--- a/point.hpp
+++ b/point.hpp
@@ -61,7 +61,7 @@ namespace util {
     template <typename T> using point3 = point<3,T>;
     template <typename T> using point4 = point<4,T>;
 
-    template <size_t S> using pointi = point<S,intmax_t>;
+    template <size_t S> using pointi = point<S,int>;
     template <size_t S> using pointf = point<S,float>;
 
     typedef point1<float> point1f;
@@ -73,14 +73,14 @@ namespace util {
     typedef point3<double> point3d;
     typedef point4<double> point4d;
 
-    typedef point1<size_t> point1u;
-    typedef point2<size_t> point2u;
-    typedef point3<size_t> point3u;
-    typedef point4<size_t> point4u;
+    typedef point1<unsigned> point1u;
+    typedef point2<unsigned> point2u;
+    typedef point3<unsigned> point3u;
+    typedef point4<unsigned> point4u;
 
-    typedef point2<intmax_t> point2i;
-    typedef point3<intmax_t> point3i;
-    typedef point4<intmax_t> point4i;
+    typedef point2<int> point2i;
+    typedef point3<int> point3i;
+    typedef point4<int> point4i;
 }
 
 #include <functional>
diff --git a/region.hpp b/region.hpp
index 8aa99816..d725d184 100644
--- a/region.hpp
+++ b/region.hpp
@@ -122,8 +122,8 @@ namespace util {
         void sanity (void) const;
     };
 
-    typedef region<2,size_t>   region2u;
-    typedef region<2,intmax_t> region2i;
+    typedef region<2,unsigned> region2u;
+    typedef region<2,int>      region2i;
     typedef region<2,float>    region2f;
     typedef region<2,double>   region2d;
 
diff --git a/vector.hpp b/vector.hpp
index e6c44274..4f34b6d9 100644
--- a/vector.hpp
+++ b/vector.hpp
@@ -61,15 +61,15 @@ namespace util {
     template <typename T> using vector3 = vector<3,T>;
     template <typename T> using vector4 = vector<4,T>;
 
-    template <size_t S> using vectoru = vector<S,uintmax_t>;
-    template <size_t S> using vectori = vector<S,intmax_t>;
+    template <size_t S> using vectoru = vector<S,unsigned>;
+    template <size_t S> using vectori = vector<S,int>;
     template <size_t S> using vectorf = vector<S,float>;
 
-    typedef vector2<size_t> vector2u;
-    typedef vector3<size_t> vector3u;
+    typedef vector2<unsigned> vector2u;
+    typedef vector3<unsigned> vector3u;
 
-    typedef vector2<intmax_t> vector2i;
-    typedef vector3<intmax_t> vector3i;
+    typedef vector2<int> vector2i;
+    typedef vector3<int> vector3i;
 
     typedef vector2<float> vector2f;
     typedef vector3<float> vector3f;