From d62a0bd81eac692c94955238a0e476d7afc9eb23 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Sun, 3 Jul 2022 23:28:41 -0500
Subject: [PATCH] Instantiate `tr_parseNum()` template using basic types
 (#3404)

There're places where e.g. `size_t` is used which may or may not match one of
`(u)intXX_t` types.

Authored-by: Mike Gelfand <mikedld@mikedld.com>
---
 libtransmission/utils.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc
index e8d1f76bd..13e1de0e1 100644
--- a/libtransmission/utils.cc
+++ b/libtransmission/utils.cc
@@ -1415,13 +1415,15 @@ template<typename T, std::enable_if_t<std::is_integral<T>::value, bool>>
 
 #endif // #if defined(__GNUC__) && !__has_include(<charconv>)
 
-template std::optional<int64_t> tr_parseNum(std::string_view& sv, int base);
-template std::optional<int32_t> tr_parseNum(std::string_view& sv, int base);
-template std::optional<int8_t> tr_parseNum(std::string_view& sv, int base);
+template std::optional<long long> tr_parseNum(std::string_view& sv, int base);
+template std::optional<long> tr_parseNum(std::string_view& sv, int base);
+template std::optional<int> tr_parseNum(std::string_view& sv, int base);
+template std::optional<char> tr_parseNum(std::string_view& sv, int base);
 
-template std::optional<uint64_t> tr_parseNum(std::string_view& sv, int base);
-template std::optional<uint32_t> tr_parseNum(std::string_view& sv, int base);
-template std::optional<uint8_t> tr_parseNum(std::string_view& sv, int base);
+template std::optional<unsigned long long> tr_parseNum(std::string_view& sv, int base);
+template std::optional<unsigned long> tr_parseNum(std::string_view& sv, int base);
+template std::optional<unsigned int> tr_parseNum(std::string_view& sv, int base);
+template std::optional<unsigned char> tr_parseNum(std::string_view& sv, int base);
 
 template<typename T, std::enable_if_t<std::is_floating_point<T>::value, bool>>
 [[nodiscard]] std::optional<T> tr_parseNum(std::string_view& sv)