From 8806f9af68514c7fa55adba28482a5a3081b38b6 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Sun, 5 Jun 2022 00:01:23 -0500
Subject: [PATCH] fix: duplicate template instantiation on raspberry pi armv7
 (#3200)

---
 libtransmission/session.cc |  2 +-
 libtransmission/utils.cc   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libtransmission/session.cc b/libtransmission/session.cc
index 42610c60a..3e1cfa4a9 100644
--- a/libtransmission/session.cc
+++ b/libtransmission/session.cc
@@ -798,7 +798,7 @@ static void sessionSetImpl(struct init_data* const data)
     if (tr_variantDictFindStrView(settings, TR_KEY_umask, &sv))
     {
         /* Read a umask as a string representing an octal number. */
-        session->umask = tr_parseNum<mode_t>(sv, 8).value_or(DefaultUmask);
+        session->umask = static_cast<mode_t>(tr_parseNum<uint32_t>(sv, 8).value_or(DefaultUmask));
         umask(session->umask);
     }
     else if (tr_variantDictFindInt(settings, TR_KEY_umask, &i))
diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc
index d0616ddf7..e8d1f76bd 100644
--- a/libtransmission/utils.cc
+++ b/libtransmission/utils.cc
@@ -1416,12 +1416,12 @@ 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<int> tr_parseNum(std::string_view& sv, int base);
-template std::optional<size_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);
 
-#ifndef _WIN32
-template std::optional<mode_t> tr_parseNum(std::string_view& sv, int base);
-#endif
+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<typename T, std::enable_if_t<std::is_floating_point<T>::value, bool>>
 [[nodiscard]] std::optional<T> tr_parseNum(std::string_view& sv)