From 24f013c95c79d679de8fa7969ef7568a1192f0a7 Mon Sep 17 00:00:00 2001
From: Tomislav Ivek <tomislav.ivek@gmail.com>
Date: Sat, 25 Oct 2014 21:04:33 +0200
Subject: Include cstdint instead of stdint.h

---
 entityx/Entity.h | 2 +-
 entityx/Event.h  | 2 +-
 entityx/System.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/entityx/Entity.h b/entityx/Entity.h
index e5c7480..fc0abef 100644
--- a/entityx/Entity.h
+++ b/entityx/Entity.h
@@ -11,7 +11,7 @@
 #pragma once
 
 
-#include <stdint.h>
+#include <cstdint>
 #include <tuple>
 #include <new>
 #include <cstdlib>
diff --git a/entityx/Event.h b/entityx/Event.h
index 53afd7d..83d791b 100644
--- a/entityx/Event.h
+++ b/entityx/Event.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <cstddef>
 #include <vector>
 #include <list>
diff --git a/entityx/System.h b/entityx/System.h
index 4854b8d..4bba9e1 100644
--- a/entityx/System.h
+++ b/entityx/System.h
@@ -11,7 +11,7 @@
 #pragma once
 
 
-#include <stdint.h>
+#include <cstdint>
 #include <unordered_map>
 #include <utility>
 #include <cassert>
-- 
cgit v1.2.3


From 77be48f980f23e415381a98125944b6cbf525f4d Mon Sep 17 00:00:00 2001
From: Tomislav Ivek <tomislav.ivek@gmail.com>
Date: Sat, 25 Oct 2014 21:38:27 +0200
Subject: Do not assume integer types in global namespace

---
 cxx11/c++11-test-cstdint.cpp | 8 ++++----
 entityx/Benchmarks_test.cc   | 2 ++
 entityx/Entity.h             | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cxx11/c++11-test-cstdint.cpp b/cxx11/c++11-test-cstdint.cpp
index be2878f..6ba852f 100644
--- a/cxx11/c++11-test-cstdint.cpp
+++ b/cxx11/c++11-test-cstdint.cpp
@@ -2,9 +2,9 @@
 int main()
 {
 	bool test = 
-		(sizeof(int8_t) == 1) &&
-		(sizeof(int16_t) == 2) &&
-		(sizeof(int32_t) == 4) &&
-		(sizeof(int64_t) == 8);
+		(sizeof(std::int8_t) == 1) &&
+		(sizeof(std::int16_t) == 2) &&
+		(sizeof(std::int32_t) == 4) &&
+		(sizeof(std::int64_t) == 8);
 	return test ? 0 : 1;
 }
diff --git a/entityx/Benchmarks_test.cc b/entityx/Benchmarks_test.cc
index 2cb067a..a5b3e81 100644
--- a/entityx/Benchmarks_test.cc
+++ b/entityx/Benchmarks_test.cc
@@ -9,6 +9,8 @@
 using namespace std;
 using namespace entityx;
 
+using std::uint64_t;
+
 
 struct AutoTimer {
   ~AutoTimer() {
diff --git a/entityx/Entity.h b/entityx/Entity.h
index fc0abef..ef9b7be 100644
--- a/entityx/Entity.h
+++ b/entityx/Entity.h
@@ -34,6 +34,8 @@
 
 namespace entityx {
 
+typedef std::uint32_t uint32_t;
+typedef std::uint64_t uint32_t;
 
 class EntityManager;
 
-- 
cgit v1.2.3


From 142b0835bf955cecfe48805012e0a1771a196903 Mon Sep 17 00:00:00 2001
From: tivek <tivek@users.noreply.github.com>
Date: Sat, 25 Oct 2014 21:51:30 +0200
Subject: fix typo

---
 entityx/Entity.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entityx/Entity.h b/entityx/Entity.h
index ef9b7be..e1e4910 100644
--- a/entityx/Entity.h
+++ b/entityx/Entity.h
@@ -35,7 +35,7 @@
 namespace entityx {
 
 typedef std::uint32_t uint32_t;
-typedef std::uint64_t uint32_t;
+typedef std::uint64_t uint64_t;
 
 class EntityManager;
 
-- 
cgit v1.2.3