From 0d86ca5d80d0d37089d3ca7a105afc5d57e98fcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Tue, 25 Nov 2014 18:39:07 +0100 Subject: [PATCH] Use of boost::long_long_type to avoid warnings. --- include/boost/intrusive/detail/array_initializer.hpp | 3 ++- include/boost/intrusive/detail/math.hpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/boost/intrusive/detail/array_initializer.hpp b/include/boost/intrusive/detail/array_initializer.hpp index b2072a8..eae7f7b 100644 --- a/include/boost/intrusive/detail/array_initializer.hpp +++ b/include/boost/intrusive/detail/array_initializer.hpp @@ -17,6 +17,7 @@ # pragma once #endif +#include #include namespace boost { @@ -31,7 +32,7 @@ union max_align int int_; long long_; #ifdef BOOST_HAS_LONG_LONG - long long long_long_; + ::boost::long_long_type long_long_; #endif float float_; double double_; diff --git a/include/boost/intrusive/detail/math.hpp b/include/boost/intrusive/detail/math.hpp index f212ae7..f6aad9c 100644 --- a/include/boost/intrusive/detail/math.hpp +++ b/include/boost/intrusive/detail/math.hpp @@ -84,9 +84,9 @@ namespace detail { #if defined(BOOST_HAS_LONG_LONG) template<> - struct builtin_clz_dispatch + struct builtin_clz_dispatch< ::boost::ulong_long_type > { - static unsigned long long call(unsigned long long n) + static ::boost::ulong_long_type call(::boost::ulong_long_type n) { return __builtin_clzll(n); } }; #endif