Cleanup to_hex_array.hpp

This commit is contained in:
Antony Polukhin
2016-11-25 21:57:26 +03:00
parent c571f9a7d8
commit 6f8cbefbf2
2 changed files with 3 additions and 23 deletions

View File

@@ -12,7 +12,6 @@
# pragma once
#endif
#include <boost/stacktrace/detail/to_hex_array.hpp>
#include <boost/core/noncopyable.hpp>
#include <boost/functional/hash.hpp>
#include <algorithm>

View File

@@ -15,31 +15,19 @@
#include <boost/array.hpp>
#include <boost/static_assert.hpp>
#include <boost/type_traits/is_pointer.hpp>
#include <boost/type_traits/make_unsigned.hpp>
namespace boost { namespace stacktrace { namespace detail {
BOOST_STATIC_CONSTEXPR char to_hex_array_bytes[] = "0123456789ABCDEF";
template <class T>
inline bool can_be_safely_trimmed_by(T addr, std::size_t part) BOOST_NOEXCEPT {
return !(addr >> (sizeof(T) / part * 8));
}
template <class T>
inline boost::array<char, 2 + sizeof(void*) * 2 + 1> to_hex_array(T addr) BOOST_NOEXCEPT {
boost::array<char, 2 + sizeof(void*) * 2 + 1> ret = {"0x"};
ret.back() = '\0';
BOOST_STATIC_ASSERT_MSG(!boost::is_pointer<T>::value, "");
const std::size_t s = (
can_be_safely_trimmed_by(addr, 2)
? (can_be_safely_trimmed_by(addr, 4)
? (can_be_safely_trimmed_by(addr, 8)
? sizeof(addr) / 8
: sizeof(addr) / 4)
: sizeof(addr) / 2)
: sizeof(addr)
);
const std::size_t s = sizeof(T);
char* out = ret.data() + s * 2 + 1;
@@ -55,16 +43,9 @@ inline boost::array<char, 2 + sizeof(void*) * 2 + 1> to_hex_array(T addr) BOOST_
return ret;
}
inline boost::array<char, 2 + sizeof(void*) * 2 + 1> to_hex_array(void* addr) BOOST_NOEXCEPT {
return to_hex_array(
reinterpret_cast<std::size_t>(addr)
);
}
inline boost::array<char, 2 + sizeof(void*) * 2 + 1> to_hex_array(const void* addr) BOOST_NOEXCEPT {
return to_hex_array(
reinterpret_cast<std::size_t>(addr)
reinterpret_cast< boost::make_unsigned<std::ptrdiff_t>::type >(addr)
);
}