diff options
| author | Alec Thomas <alec@swapoff.org> | 2014-10-27 11:20:05 +1100 |
|---|---|---|
| committer | Alec Thomas <alec@swapoff.org> | 2014-10-27 11:20:05 +1100 |
| commit | a57f7436212de0ffaf811f23d24bec8b9838a6df (patch) | |
| tree | 9a043b64c94b20705d60e926f0d4478fd6d474af | |
| parent | f19eaf65bcd8dac1a852b1ee5084545a44585096 (diff) | |
| parent | aa0a2b3a49f34eb5c63b8a56519b30627b1ae637 (diff) | |
Merge branch 'master' of github.com:alecthomas/entityx
| -rw-r--r-- | cxx11/c++11-test-cstdint.cpp | 8 | ||||
| -rw-r--r-- | entityx/Benchmarks_test.cc | 2 | ||||
| -rw-r--r-- | entityx/Entity.h | 4 | ||||
| -rw-r--r-- | entityx/Event.h | 2 | ||||
| -rw-r--r-- | entityx/System.h | 2 |
5 files changed, 11 insertions, 7 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 d546189..1410bd8 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> @@ -34,6 +34,8 @@ namespace entityx { +typedef std::uint32_t uint32_t; +typedef std::uint64_t uint64_t; class EntityManager; diff --git a/entityx/Event.h b/entityx/Event.h index 7763723..9919eb8 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 996e442..076bb33 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> |