diff options
| author | Alex Zolotarev <alex@maps.me> | 2015-06-24 13:46:55 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:52:31 +0300 |
| commit | 65e733dfea699d9c75c1f413488a2d9071944c03 (patch) | |
| tree | 3891e3f4588175ec85f2a9ed4e48303db28b4130 /std | |
| parent | b64031160cf61bf566bcf22b692c223bef39fe67 (diff) | |
Fixed <cstdint>.
Diffstat (limited to 'std')
| -rw-r--r-- | std/cstdint.hpp | 19 | ||||
| -rw-r--r-- | std/stdint.hpp | 32 |
2 files changed, 19 insertions, 32 deletions
diff --git a/std/cstdint.hpp b/std/cstdint.hpp new file mode 100644 index 0000000000..8ced63f058 --- /dev/null +++ b/std/cstdint.hpp @@ -0,0 +1,19 @@ +#pragma once + +#ifdef new +#undef new +#endif + +#include <cstdint> +using std::int8_t; +using std::uint8_t; +using std::int16_t; +using std::uint16_t; +using std::int32_t; +using std::uint32_t; +using std::int64_t; +using std::uint64_t; + +#ifdef DEBUG_NEW +#define new DEBUG_NEW +#endif diff --git a/std/stdint.hpp b/std/stdint.hpp deleted file mode 100644 index 16786e8886..0000000000 --- a/std/stdint.hpp +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#include "common_defines.hpp" -#include "target_os.hpp" - -#ifdef new -#undef new -#endif - -#if defined(_MSC_VER) && _MSC_VER < 1600 // in VS2010 types below are defined - typedef __int8 int8_t; - typedef __int16 int16_t; - typedef __int32 int32_t; - typedef __int64 int64_t; - typedef unsigned __int8 uint8_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int32 uint32_t; - typedef unsigned __int64 uint64_t; - -#elif defined(OMIM_OS_BADA) || defined(OMIM_OS_ANDROID) - #include <stdint.h> - -#else - #ifdef OMIM_OS_LINUX - #include <stdint.h> - #endif - #include <boost/cstdint.hpp> - -#endif - -#ifdef DEBUG_NEW -#define new DEBUG_NEW -#endif |