fixed const on ILogStream, added some platform macros and fixed compiler warnings on concepts

Author: ZilverBlade

src/PyroCommon/Concepts.hpp

@@ -26,8 +26,8 @@
 namespace PyroshockStudios {
     template <typename From, typename To>
     concept ConvertibleTo =
-        requires {
-            static_cast<To>(eastl::declval<From>());
+        requires(From f) {
+            static_cast<To>(f);
         };
 
     template <typename T>
@@ -48,9 +48,7 @@ namespace PyroshockStudios {
 
     template <typename T>
     concept CopyMoveableConcept =
-        requires {
-            CopyableConcept<T>&& MoveableConcept<T>;
-        };
+        CopyableConcept<T> && MoveableConcept<T>;
 
     template <typename T>
     concept IterableConcept =
@@ -61,16 +59,19 @@ namespace PyroshockStudios {
 
     template <typename T>
     concept CollectionConcept =
+        IterableConcept<T> &&
         requires(const T& t) {
-            requires IterableConcept<T>;
             t.size();
         };
 
     template <typename C>
-    concept ContiguousCollectionConcept = requires(C& c) {
-        { c.data() } -> ConvertibleTo<typename eastl::add_pointer_t<eastl::remove_reference_t<decltype(*c.data())>>>;
-        { c.size() } -> ConvertibleTo<size_t>;
-    };
+    concept ContiguousCollectionConcept =
+        requires(C& c) {
+            { c.data() } -> ConvertibleTo<typename eastl::add_pointer_t<
+                eastl::remove_reference_t<decltype(*c.data())>>>;
+            { c.size() } -> ConvertibleTo<size_t>;
+        };
+
     template <typename T>
     concept MapConcept =
         requires(const T& t) {
@@ -97,9 +98,9 @@ namespace PyroshockStudios {
         c.push_back(v);
     };
 
-    template <typename C>
-    concept EmplaceBackableConcept = requires(C& c, eastl::remove_cvref_t<decltype(*c.begin())> v) {
-        c.push_back(v);
+    template <typename C, typename... Args>
+    concept EmplaceBackableConcept = requires(C& c, Args&&... args) {
+        c.emplace_back(eastl::forward<Args>(args)...);
     };
 
     template <typename T>

src/PyroCommon/LoggerInterface.hpp

@@ -38,7 +38,7 @@ namespace PyroshockStudios {
         ILogStream() = default;
         ~ILogStream() = default;
 
-        virtual void Log(LogSeverity severity, const char* message) const = 0;
+        virtual void Log(LogSeverity severity, const char* message) = 0;
         virtual LogSeverity MinSeverity() const = 0;
         virtual const char* Name() const = 0;
     };
@@ -47,6 +47,6 @@ namespace PyroshockStudios {
         ILoggerAware() = default;
         ~ILoggerAware() = default;
 
-        virtual void InjectLogger(const ILogStream* stream) = 0;
+        virtual void InjectLogger(ILogStream* stream) = 0;
     };
 } // namespace PyroshockStudios

src/PyroCommon/Platform.hpp

@@ -58,8 +58,17 @@
 #endif
 
 #if defined(__APPLE__)
+#include <TargetConditionals.h>
+
 #define PYRO_PLATFORM_FAMILY_UNIX 1
+#define PYRO_PLATFORM_FAMILY_APPLE 1
+
+#if defined(TARGET_OS_OSX)
 #define PYRO_PLATFORM_MACOS 1
+#elif defined(TARGET_OS_IOS)
+#define PYRO_PLATFORM_IOS 1
+#endif
+
 #endif