Portability fixes for multi-match

gershnik · Jan 4, 2024 · 9cdbc43 · 9cdbc43
1 parent 38016a6
commit 9cdbc43
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Translit/src/MultiMatch.hpp b/Translit/src/MultiMatch.hpp
@@ -9,7 +9,10 @@
 #include <ranges>
 #include <algorithm>
 #include <array>
+#include <vector>
 #include <string_view>
+#include <climits>
+#include <stdexcept>
 
 template<class Char, size_t N>
 struct CTString {
@@ -42,7 +45,7 @@ template<CTString First, CTString... Rest>
 constexpr bool SameCharType = (std::is_same_v<typename decltype(First)::char_type, typename decltype(Rest)::char_type> && ...);
 
 template<CTString First>
-using CharTypeOf = decltype(First)::char_type;
+using CharTypeOf = typename decltype(First)::char_type;
 
 template<class T, size_t MaxSize>
 class StaticVector {
@@ -345,6 +348,7 @@ constexpr auto match(const Matcher & matcher, Range && r) noexcept -> size_t {
 
     #include <iostream>
     #include <iomanip>
+    #include <string>
 
     template<class Char, Impl::Sizes Sizes>
     void debugPrint(const MultiMatch<Char, Sizes> & val) {

diff --git a/Translit/src/pch.hpp b/Translit/src/pch.hpp
@@ -16,6 +16,8 @@
 #include <utility>
 #include <type_traits>
 #include <concepts>
+#include <climits>
+#include <stdexcept>
 
 #include <signal.h>
 #include <stdio.h>