Merge branch 'master' into update_to_current_monero

2017-08-25 15:01:32 -07:00 · 2017-08-25 15:01:32 -07:00 · f697355101
parent b3d8279af3 27cc594905
commit f697355101
3 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -115,7 +115,6 @@ set(LIBRARIES
        crypto
        ssl)

-
 if(APPLE)
    set(LIBRARIES ${LIBRARIES} "-framework IOKit")
 else()
--- a/src/page.h
+++ b/src/page.h
@ -5276,7 +5276,7 @@ namespace xmreg
                    {"tx_size"               , fmt::format("{:0.4f}",
                                                           static_cast<double>(txd.size) / 1024.0)},
                    {"tx_fee"                , xmreg::xmr_amount_to_str(txd.fee)},
-                    {"tx_version"            , txd.version},
+                    {"tx_version"            , static_cast<uint64_t>(txd.version)},
                    {"blk_timestamp"         , blk_timestamp},
                    {"blk_timestamp_uint"    , blk.timestamp},
                    {"delta_time"            , age.first},
--- a/src/tools.cpp
+++ b/src/tools.cpp
@ -6,6 +6,7 @@
 #include <codecvt>
 #include <thread>

+
 namespace xmreg
 {