From 12a6001ddf92123ee80e5f9a04ddded20028ad4c Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Wed, 24 Jul 2019 12:41:18 +0200 Subject: [PATCH] fixed linking error --- src/currency_core/currency_format_utils_transactions.cpp | 4 ++-- src/currency_core/currency_format_utils_transactions.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/currency_core/currency_format_utils_transactions.cpp b/src/currency_core/currency_format_utils_transactions.cpp index e8162a84..6f8a988b 100644 --- a/src/currency_core/currency_format_utils_transactions.cpp +++ b/src/currency_core/currency_format_utils_transactions.cpp @@ -32,7 +32,7 @@ namespace currency return expiration_time <= expiration_ts_median + TX_EXPIRATION_MEDIAN_SHIFT; } //--------------------------------------------------------------- - inline uint64_t get_tx_unlock_time(const transaction& tx, uint64_t o_i) + uint64_t get_tx_unlock_time(const transaction& tx, uint64_t o_i) { // etc_tx_details_expiration_time have priority over etc_tx_details_expiration_time2 uint64_t v = get_tx_x_detail(tx); @@ -54,7 +54,7 @@ namespace currency return ut2.unlock_time_array[o_i]; } //--------------------------------------------------------------- - inline bool get_tx_max_min_unlock_time(const transaction& tx, uint64_t& max_unlock_time, uint64_t& min_unlock_time) + bool get_tx_max_min_unlock_time(const transaction& tx, uint64_t& max_unlock_time, uint64_t& min_unlock_time) { max_unlock_time = min_unlock_time = 0; // etc_tx_details_expiration_time have priority over etc_tx_details_expiration_time2 diff --git a/src/currency_core/currency_format_utils_transactions.h b/src/currency_core/currency_format_utils_transactions.h index 7ba50b5e..197802b4 100644 --- a/src/currency_core/currency_format_utils_transactions.h +++ b/src/currency_core/currency_format_utils_transactions.h @@ -79,8 +79,8 @@ namespace currency update_or_add_field_to_extra(tx.extra, e); } - inline uint64_t get_tx_unlock_time(const transaction& tx, uint64_t o_i); - inline bool get_tx_max_min_unlock_time(const transaction& tx, uint64_t& max_unlock_time, uint64_t& min_unlock_time); + uint64_t get_tx_unlock_time(const transaction& tx, uint64_t o_i); + bool get_tx_max_min_unlock_time(const transaction& tx, uint64_t& max_unlock_time, uint64_t& min_unlock_time); inline uint64_t get_tx_flags(const transaction& tx) { return get_tx_x_detail(tx); } inline uint64_t get_tx_expiration_time(const transaction& tx) {return get_tx_x_detail(tx); } inline void set_tx_unlock_time(transaction& tx, uint64_t v) { set_tx_x_detail(tx, v); }