From e226b0dd6fe9f89dc30d1cd488efbd0c71cc4a13 Mon Sep 17 00:00:00 2001 From: vng Date: Fri, 29 Aug 2014 15:50:21 +0300 Subject: Avoid code duplicating. --- std/type_traits.hpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'std') diff --git a/std/type_traits.hpp b/std/type_traits.hpp index 15016924fc..769bbf22a6 100644 --- a/std/type_traits.hpp +++ b/std/type_traits.hpp @@ -1,17 +1,31 @@ #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 +#include + +using boost::enable_if; + using boost::is_same; using boost::make_signed; using boost::make_unsigned; using boost::is_signed; using boost::is_unsigned; using boost::is_floating_point; +using boost::is_integral; #ifdef DEBUG_NEW #define new DEBUG_NEW -- cgit v1.2.3