aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/dns_utils.cpp16
-rw-r--r--src/common/dns_utils.h7
-rw-r--r--src/common/unordered_containers_boost_serialization.h6
3 files changed, 3 insertions, 26 deletions
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index 2efdcffcd..83259bc70 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -451,22 +451,6 @@ std::string get_account_address_as_str_from_url(const std::string& url, bool& dn
return addresses[0];
}
-bool get_account_address_from_str_or_url(
- cryptonote::account_public_address& address
- , bool& has_payment_id
- , crypto::hash8& payment_id
- , bool testnet
- , const std::string& str_or_url
- )
-{
- if (cryptonote::get_account_integrated_address_from_str(address, has_payment_id, payment_id, testnet, str_or_url))
- return true;
- bool dnssec_valid;
- std::string address_str = get_account_address_as_str_from_url(str_or_url, dnssec_valid);
- return !address_str.empty() &&
- cryptonote::get_account_integrated_address_from_str(address, has_payment_id, payment_id, testnet, address_str);
-}
-
} // namespace tools::dns_utils
} // namespace tools
diff --git a/src/common/dns_utils.h b/src/common/dns_utils.h
index 5fe1d4775..8a63a8129 100644
--- a/src/common/dns_utils.h
+++ b/src/common/dns_utils.h
@@ -164,13 +164,6 @@ std::string address_from_txt_record(const std::string& s);
std::vector<std::string> addresses_from_url(const std::string& url, bool& dnssec_valid);
std::string get_account_address_as_str_from_url(const std::string& url, bool& dnssec_valid);
-bool get_account_address_from_str_or_url(
- cryptonote::account_public_address& address
- , bool& has_payment_id
- , crypto::hash8& payment_id
- , bool testnet
- , const std::string& str_or_url
- );
} // namespace tools::dns_utils
diff --git a/src/common/unordered_containers_boost_serialization.h b/src/common/unordered_containers_boost_serialization.h
index 08b5d9ccf..b2d5b27a6 100644
--- a/src/common/unordered_containers_boost_serialization.h
+++ b/src/common/unordered_containers_boost_serialization.h
@@ -43,7 +43,7 @@ namespace boost
{
size_t s = x.size();
a << s;
- BOOST_FOREACH(auto& v, x)
+ for(auto& v: x)
{
a << v.first;
a << v.second;
@@ -72,7 +72,7 @@ namespace boost
{
size_t s = x.size();
a << s;
- BOOST_FOREACH(auto& v, x)
+ for(auto& v: x)
{
a << v.first;
a << v.second;
@@ -101,7 +101,7 @@ namespace boost
{
size_t s = x.size();
a << s;
- BOOST_FOREACH(auto& v, x)
+ for(auto& v: x)
{
a << v;
}