Remove unnecessary code in variant class

.clang-format

@@ -14,7 +14,7 @@ AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: AllDefinitions
+AlwaysBreakAfterReturnType: TopLevel
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: true
 BinPackArguments: true

libraries/fc/include/fc/crypto/aes.hpp

@@ -1,9 +1,9 @@
 #pragma once
+#include <vector>
 #include <fc/crypto/sha512.hpp>
 #include <fc/crypto/sha256.hpp>
 #include <fc/uint128.hpp>
 #include <fc/fwd.hpp>
-#include <vector>
 
 namespace fc {
     class path;

libraries/fc/include/fc/crypto/sha224.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include <unordered_map>
+#include <functional>
 #include <fc/fwd.hpp>
 #include <fc/io/raw_fwd.hpp>
 #include <fc/string.hpp>

libraries/fc/include/fc/crypto/sha256.hpp

@@ -1,4 +1,6 @@
 #pragma once
+#include <functional>
+#include <boost/functional/hash.hpp>
 #include <fc/fwd.hpp>
 #include <fc/string.hpp>
 #include <fc/platform_independence.hpp>

libraries/fc/include/fc/variant.hpp

@@ -12,7 +12,6 @@
 #include <vector>
 
 #include <boost/multi_index_container_fwd.hpp>
-#include <boost/multiprecision/cpp_int.hpp>
 
 #include <fc/smart_ref_fwd.hpp>
 #include <fc/string.hpp>
@@ -54,27 +53,6 @@ namespace fc
    template<typename T, typename... Args> void to_variant( const boost::multi_index_container<T,Args...>& s, variant& v );
    template<typename T, typename... Args> void from_variant( const variant& v, boost::multi_index_container<T,Args...>& s );
 
-   using namespace boost::multiprecision;
-   template<size_t Size>
-   using UInt = number<cpp_int_backend<Size, Size, unsigned_magnitude, unchecked, void> >;
-   template<size_t Size>
-   using Int = number<cpp_int_backend<Size, Size, signed_magnitude, unchecked, void> >;
-
-   void to_variant( const UInt<8>& n, variant& v );
-   void from_variant( const variant& v, UInt<8>& n );
-
-   void to_variant( const UInt<16>& n, variant& v );
-   void from_variant( const variant& v, UInt<16>& n );
-
-   void to_variant( const UInt<32>& n, variant& v );
-   void from_variant( const variant& v, UInt<32>& n );
-
-   void to_variant( const UInt<64>& n, variant& v );
-   void from_variant( const variant& v, UInt<64>& n );
-
-   template<typename T> void to_variant( const boost::multiprecision::number<T>& n, variant& v );
-   template<typename T> void from_variant( const variant& v, boost::multiprecision::number<T>& n );
-
    template<typename T> void to_variant( const smart_ref<T>& s, variant& v );
    template<typename T> void from_variant( const variant& v, smart_ref<T>& s );
    template<typename T> void to_variant( const safe<T>& s, variant& v );
@@ -656,12 +634,6 @@ namespace fc
       for( const auto& item : vars )
          c.insert( item.as<T>() );
    }
-   template<typename T> void to_variant( const boost::multiprecision::number<T>& n, variant& v ) {
-      v = n.str();
-   }
-   template<typename T> void from_variant( const variant& v, boost::multiprecision::number<T>& n ) {
-      n = boost::multiprecision::number<T>(v.get_string());
-   }
 
    variant operator + ( const variant& a, const variant& b );
    variant operator - ( const variant& a, const variant& b );

libraries/fc/src/log/logger_config.cpp

@@ -1,18 +1,21 @@
 #include <fc/log/logger_config.hpp>
-#include <fc/log/appender.hpp>
-#include <fc/io/json.hpp>
-#include <fc/filesystem.hpp>
-#include <unordered_map>
+
+#include <iostream>
 #include <string>
+#include <unordered_map>
+
+#include <fc/filesystem.hpp>
+#include <fc/reflect/variant.hpp>
+#include <fc/exception/exception.hpp>
+#include <fc/io/json.hpp>
+
+#include <fc/log/appender.hpp>
 #include <fc/log/console_appender.hpp>
 
 #ifndef FCLITE
 #include <fc/log/gelf_appender.hpp>
 #endif
 
-#include <fc/reflect/variant.hpp>
-#include <fc/exception/exception.hpp>
-
 namespace fc {
    extern std::unordered_map<std::string,logger>& get_logger_map();
    extern std::unordered_map<std::string,appender::ptr>& get_appender_map();

libraries/fc/src/variant.cpp

@@ -735,21 +735,6 @@ void from_variant( const variant& var,  std::vector<char>& vo )
 //   vo = std::vector<char>( b64.c_str(), b64.c_str() + b64.size() );
 }
 
-void to_variant( const UInt<8>& n, variant& v ) { v = uint64_t(n); }
-// TODO: warn on overflow?
-void from_variant( const variant& v, UInt<8>& n ) { n = static_cast<uint8_t>(v.as_uint64()); }
-
-void to_variant( const UInt<16>& n, variant& v ) { v = uint64_t(n); }
-// TODO: warn on overflow?
-void from_variant( const variant& v, UInt<16>& n ) { n = static_cast<uint16_t>(v.as_uint64()); }
-
-void to_variant( const UInt<32>& n, variant& v ) { v = uint64_t(n); }
-// TODO: warn on overflow?
-void from_variant( const variant& v, UInt<32>& n ) { n = static_cast<uint32_t>(v.as_uint64()); }
-
-void to_variant( const UInt<64>& n, variant& v ) { v = uint64_t(n); }
-void from_variant( const variant& v, UInt<64>& n ) { n = v.as_uint64(); }
-
 string      format_string( const string& format, const variant_object& args )
 {
    std::stringstream ss;