Do not assume integer types in global namespace

alecthomas · Oct 25, 2014 · 77be48f · 77be48f
1 parent 24f013c
commit 77be48f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -34,6 +34,8 @@
 
 namespace entityx {
 
+typedef std::uint32_t uint32_t;
+typedef std::uint64_t uint32_t;
 
 class EntityManager;