From 3331e419e572c8ffe74edc4703729f40e84594de Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 4 Nov 2021 11:42:11 +0100 Subject: [PATCH] disabled boost locale for ios --- src/currency_core/currency_format_utils.cpp | 4 ++-- src/currency_core/currency_format_utils.h | 2 +- src/currency_core/offers_services_helpers.cpp | 8 ++++---- src/currency_core/offers_services_helpers.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp index 7019ce41..7e011be3 100644 --- a/src/currency_core/currency_format_utils.cpp +++ b/src/currency_core/currency_format_utils.cpp @@ -7,7 +7,7 @@ #include "include_base_utils.h" #include -#ifndef ANDROID_BUILD +#ifndef MOBILE_WALLET_BUILD #include #endif using namespace epee; @@ -3208,7 +3208,7 @@ namespace currency return o << "<" << r.n << ":" << r.tx_id << ">"; } //-------------------------------------------------------------------------------- -#ifndef ANDROID_BUILD +#ifndef MOBILE_WALLET_BUILD const std::locale& utf8_get_conversion_locale() { static std::locale loc = boost::locale::generator().generate("en_US.UTF-8"); diff --git a/src/currency_core/currency_format_utils.h b/src/currency_core/currency_format_utils.h index 725b39e1..1118b066 100644 --- a/src/currency_core/currency_format_utils.h +++ b/src/currency_core/currency_format_utils.h @@ -743,7 +743,7 @@ namespace currency //--------------------------------------------------------------- std::ostream& operator <<(std::ostream& o, const ref_by_id& r); //--------------------------------------------------------------- -#ifndef ANDROID_BUILD +#ifndef MOBILE_WALLET_BUILD std::string utf8_to_upper(const std::string& s); std::string utf8_to_lower(const std::string& s); bool utf8_substring_test_case_insensitive(const std::string& match, const std::string& s); // Returns true is 's' contains 'match' (case-insensitive) diff --git a/src/currency_core/offers_services_helpers.cpp b/src/currency_core/offers_services_helpers.cpp index d99bf4de..0029ef4e 100644 --- a/src/currency_core/offers_services_helpers.cpp +++ b/src/currency_core/offers_services_helpers.cpp @@ -56,7 +56,7 @@ namespace bc_services //------------------------------------------------------------------ bool order_offers_by_name(const offer_details_ex* a, const offer_details_ex* b) { -#ifndef ANDROID_BUILD +#ifndef MOBILE_WALLET_BUILD return currency::utf8_to_lower(a->target) < currency::utf8_to_lower(b->target); #else return false; @@ -150,7 +150,7 @@ namespace bc_services //check category if (!of.category.empty() && o.category.find(of.category) == std::string::npos) return false; -#ifndef ANDROID_BUILD +#ifndef MOBILE_WALLET_BUILD //check target condition if (of.target.size() && !currency::utf8_substring_test_case_insensitive(of.target, o.target)) return false; @@ -173,7 +173,7 @@ namespace bc_services //check target condition if (of.location_country.size() && (of.location_country != o.location_country)) return false; -#ifndef ANDROID_BUILD +#ifndef MOBILE_WALLET_BUILD //check target condition if (of.location_city.size() && !currency::utf8_substring_test_case_insensitive(of.location_city, o.location_city)) return false; @@ -221,7 +221,7 @@ namespace bc_services //-------------------------------------------------------------------------------- bool filter_offers_list(std::list& offers, const bc_services::core_offers_filter& filter, uint64_t current_core_time) { -#ifndef ANDROID_BUILD +#ifndef MOBILE_WALLET_BUILD //filter offers.remove_if([&](bc_services::offer_details_ex& o) -> bool { return !is_offer_matched_by_filter(o, filter, current_core_time); diff --git a/src/currency_core/offers_services_helpers.h b/src/currency_core/offers_services_helpers.h index 1484622c..1d0aa919 100644 --- a/src/currency_core/offers_services_helpers.h +++ b/src/currency_core/offers_services_helpers.h @@ -193,14 +193,14 @@ namespace bc_services inline std::string extract_contacts(const odeh& v) { return v.contacts; } inline std::string extract_location(const odeh& v) { -#ifndef ANDROID_BUILD +#ifndef MOBILE_WALLET_BUILD return currency::utf8_to_lower(v.location_country + v.location_city); #else return "UNSUPORTED"; #endif } inline std::string extract_name(const odeh& v) { -#ifndef ANDROID_BUILD +#ifndef MOBILE_WALLET_BUILD return currency::utf8_to_lower(v.target); #else return "UNSUPORTED";