diff options
| author | Timothy Flynn <trflynn89@pm.me> | 2022-12-15 17:28:18 -0500 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-12-16 10:06:26 +0100 |
| commit | d28c9ba054112cda3788cef73e5abccecfeefc66 (patch) | |
| tree | 7fee5c5a7d12c266094fc4b22743862af7914d41 /AK | |
| parent | a67ad665b1677b6ba162c39b4ea788ad5ae12bb7 (diff) | |
| download | serenity-d28c9ba054112cda3788cef73e5abccecfeefc66.zip | |
AK: Synchronize explicit instantiations of to_int and to_uint
1. Ensure long and long long are instantiated for to_int.
2. Ensure long and long long are not instantiated for to_uint.
Diffstat (limited to 'AK')
| -rw-r--r-- | AK/DeprecatedString.cpp | 3 | ||||
| -rw-r--r-- | AK/StringUtils.cpp | 2 | ||||
| -rw-r--r-- | AK/StringView.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/AK/DeprecatedString.cpp b/AK/DeprecatedString.cpp index f30fbae61f..c2ff851ea6 100644 --- a/AK/DeprecatedString.cpp +++ b/AK/DeprecatedString.cpp @@ -172,7 +172,8 @@ Optional<T> DeprecatedString::to_int(TrimWhitespace trim_whitespace) const template Optional<i8> DeprecatedString::to_int(TrimWhitespace) const; template Optional<i16> DeprecatedString::to_int(TrimWhitespace) const; template Optional<i32> DeprecatedString::to_int(TrimWhitespace) const; -template Optional<i64> DeprecatedString::to_int(TrimWhitespace) const; +template Optional<long> DeprecatedString::to_int(TrimWhitespace) const; +template Optional<long long> DeprecatedString::to_int(TrimWhitespace) const; template<typename T> Optional<T> DeprecatedString::to_uint(TrimWhitespace trim_whitespace) const diff --git a/AK/StringUtils.cpp b/AK/StringUtils.cpp index 58157d148e..eba74f8ee0 100644 --- a/AK/StringUtils.cpp +++ b/AK/StringUtils.cpp @@ -157,8 +157,6 @@ template Optional<u16> convert_to_uint(StringView str, TrimWhitespace); template Optional<u32> convert_to_uint(StringView str, TrimWhitespace); template Optional<unsigned long> convert_to_uint(StringView str, TrimWhitespace); template Optional<unsigned long long> convert_to_uint(StringView str, TrimWhitespace); -template Optional<long> convert_to_uint(StringView str, TrimWhitespace); -template Optional<long long> convert_to_uint(StringView str, TrimWhitespace); template<typename T> Optional<T> convert_to_uint_from_hex(StringView str, TrimWhitespace trim_whitespace) diff --git a/AK/StringView.cpp b/AK/StringView.cpp index f299ab707b..92315f6add 100644 --- a/AK/StringView.cpp +++ b/AK/StringView.cpp @@ -239,8 +239,6 @@ template Optional<u16> StringView::to_uint() const; template Optional<u32> StringView::to_uint() const; template Optional<unsigned long> StringView::to_uint() const; template Optional<unsigned long long> StringView::to_uint() const; -template Optional<long> StringView::to_uint() const; -template Optional<long long> StringView::to_uint() const; #ifndef KERNEL Optional<double> StringView::to_double(TrimWhitespace trim_whitespace) const |