Open-source CI fixes

electronicarts · Oct 20, 2021 · 20ca243 · 20ca243
1 parent 4e3064a
commit 20ca243
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/include/EASTL/internal/type_transformations.h b/include/EASTL/internal/type_transformations.h
@@ -399,6 +399,10 @@ namespace eastl
 		template <> struct make_unsigned<char>                 { typedef unsigned char          type; };
 	#endif
 
+	#if defined(EA_CHAR8_UNIQUE) && EA_CHAR8_UNIQUE
+	template <> struct make_unsigned<char8_t>                 { typedef unsigned char           type; };
+	#endif
+
 	template <typename T>
 	struct make_unsigned<const T>
 	{

diff --git a/test/source/TestVariant.cpp b/test/source/TestVariant.cpp
@@ -657,6 +657,7 @@ EA_NO_INLINE int TestVariantVisitNoInline(const eastl::variant<int, bool, unsign
 	struct MyVisitor
 	{
 		MyVisitor() = delete;
+		MyVisitor(bool& b) : mVisited(b) {}
 
 		void operator()(int) { mVisited = true; }
 		void operator()(bool) { mVisited = true; }
@@ -681,6 +682,7 @@ EA_NO_INLINE int TestVariantVisit2NoInline(const eastl::variant<int, bool>& v0,
 	struct MyVisitor
 	{
 		MyVisitor() = delete;
+		MyVisitor(bool& b) : mVisited(b) {}
 
 		void operator()(int, int) { mVisited = true; }
 		void operator()(bool, int) { mVisited = true; }
@@ -706,6 +708,7 @@ EA_NO_INLINE int TestVariantVisit3tNoInline(const eastl::variant<int, bool>& v0,
 	struct MyVisitor
 	{
 		MyVisitor() = delete;
+		MyVisitor(bool& b) : mVisited(b) {}
 
 		void operator()(int, int, int) { mVisited = true; }
 		void operator()(bool, int, int) { mVisited = true; }
@@ -979,6 +982,7 @@ int TestVariantVisitor()
 		struct MultipleVisitor
 		{
 			MultipleVisitor() = delete;
+			MultipleVisitor(bool& b) : mVisited(b) {}
 
 			void operator()(int, int) { mVisited = true; }
 			void operator()(int, bool) {}