Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/std
diff options
context:
space:
mode:
authorSergey Yershov <yershov@corp.mail.ru>2015-02-13 21:22:46 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:38:06 +0300
commit3363aba81c28935c23de60f5874ce11c77796868 (patch)
tree8dd3d91462369ce1b68a3505b27dfa47b533a2af /std
parent351a5deb337c6d680e4d8ae62e0a510d7ae7cbdb (diff)
Added generator_tool option for set osm data type [xml or o5m]
Diffstat (limited to 'std')
-rw-r--r--std/type_traits.hpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/std/type_traits.hpp b/std/type_traits.hpp
index 769bbf22a6..659b6ba275 100644
--- a/std/type_traits.hpp
+++ b/std/type_traits.hpp
@@ -14,18 +14,18 @@
#endif
#endif
-#include <boost/type_traits.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <type_traits>
-using boost::enable_if;
+using std::enable_if;
+using std::conditional;
-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;
+using std::is_same;
+using std::make_signed;
+using std::make_unsigned;
+using std::is_signed;
+using std::is_unsigned;
+using std::is_floating_point;
+using std::is_integral;
#ifdef DEBUG_NEW
#define new DEBUG_NEW