diff options
author | Alex Zolotarev <alex@maps.me> | 2015-06-24 15:49:13 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:52:34 +0300 |
commit | d7dfd870746a3e89ade642fd7d2605e753bbdafd (patch) | |
tree | e7430de05332b7d0834f9c6670cb8616604ed315 /std/type_traits.hpp | |
parent | 7afc128a29c5a290f34e4f7aafcbe0e80bb09f50 (diff) |
std folder cleanup & removing not needed boost references.
Diffstat (limited to 'std/type_traits.hpp')
-rw-r--r-- | std/type_traits.hpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/std/type_traits.hpp b/std/type_traits.hpp index 59068a4180..ca2a399e48 100644 --- a/std/type_traits.hpp +++ b/std/type_traits.hpp @@ -1,33 +1,23 @@ #pragma once -#include "common_defines.hpp" #include "target_os.hpp" #ifdef new #undef new #endif -#ifdef OMIM_OS_MAC -// http://stackoverflow.com/questions/8173620/c-boost-1-48-type-traits-and-cocoa-inclusion-weirdness -// Cocoa defines "check" macros as is. It breaks compilation of boost/type_traits. -#ifdef check -#undef check -#endif -#endif - #include <type_traits> -using std::enable_if; using std::conditional; - -using std::is_same; -using std::make_signed; -using std::make_unsigned; -using std::is_signed; -using std::is_unsigned; +using std::enable_if; +using std::is_arithmetic; using std::is_floating_point; using std::is_integral; -using std::is_arithmetic; using std::is_pod; +using std::is_same; +using std::is_signed; +using std::is_unsigned; +using std::make_signed; +using std::make_unsigned; using std::underlying_type; /// @todo clang on linux doesn't have is_trivially_copyable. |