From 6f8cbefbf2c316a1870a937ea7d91f613554bb03 Mon Sep 17 00:00:00 2001
From: Antony Polukhin <antoshkka@gmail.com>
Date: Fri, 25 Nov 2016 21:57:26 +0300
Subject: [PATCH] Cleanup to_hex_array.hpp

---
 .../stacktrace/detail/backend_windows.hpp     |  1 -
 .../boost/stacktrace/detail/to_hex_array.hpp  | 25 +++----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/include/boost/stacktrace/detail/backend_windows.hpp b/include/boost/stacktrace/detail/backend_windows.hpp
index 08440c7..3958a54 100644
--- a/include/boost/stacktrace/detail/backend_windows.hpp
+++ b/include/boost/stacktrace/detail/backend_windows.hpp
@@ -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>
diff --git a/include/boost/stacktrace/detail/to_hex_array.hpp b/include/boost/stacktrace/detail/to_hex_array.hpp
index 875a3a0..57f8233 100644
--- a/include/boost/stacktrace/detail/to_hex_array.hpp
+++ b/include/boost/stacktrace/detail/to_hex_array.hpp
@@ -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)
     );
 }