Merge branch 'master' into Playerbot

src/common/Utilities/EventProcessor.h

@@ -21,7 +21,6 @@
 #include "Define.h"
 #include "Duration.h"
 #include "Random.h"
-#include "advstd.h"
 #include <map>
 #include <type_traits>
 
@@ -90,7 +89,7 @@ class LambdaBasicEvent : public BasicEvent
 };
 
 template<typename T>
-using is_lambda_event = std::enable_if_t<!std::is_base_of_v<BasicEvent, std::remove_pointer_t<advstd::remove_cvref_t<T>>>>;
+using is_lambda_event = std::enable_if_t<!std::is_base_of_v<BasicEvent, std::remove_pointer_t<std::remove_cvref_t<T>>>>;
 
 typedef std::multimap<uint64, BasicEvent*> EventList;
 

src/common/Utilities/StringFormat.cpp

@@ -17,7 +17,6 @@
 
 #include "StringFormat.h"
 #include "Define.h"
-#include <locale>
 
 template<class Str>
 AC_COMMON_API Str Acore::String::Trim(const Str& s, const std::locale& loc /*= std::locale()*/)

src/common/Utilities/StringFormat.h

@@ -21,6 +21,7 @@
 #include "Define.h"
 #include <fmt/format.h>
 #include <fmt/printf.h>
+#include <locale>
 
 namespace Acore
 {
@@ -39,17 +40,20 @@ namespace Acore
         }
     }
 
+    template<typename... Args>
+    using FormatString = fmt::format_string<Args...>;
+
     // Default string format function.
     template<typename... Args>
-    inline std::string StringFormatFmt(std::string_view fmt, Args&&... args)
+    inline std::string StringFormatFmt(FormatString<Args...> fmt, Args&&... args)
     {
         try
         {
             return fmt::format(fmt, std::forward<Args>(args)...);
         }
-        catch (const fmt::format_error& formatError)
+        catch (std::exception const& e)
         {
-            return fmt::format("An error occurred formatting string \"{}\": {}", fmt, formatError.what());
+            return fmt::format("Wrong format occurred ({}). Fmt string: '{}'", e.what(), fmt.get());
         }
     }
 
@@ -76,4 +80,9 @@ namespace Acore::String
     AC_COMMON_API std::string AddSuffixIfNotExists(std::string str, const char suffix);
 }
 
+// Add support enum for fmt
+//template <typename T, std::enable_if_t<std::is_enum_v<T>, int> = 0>
+template <typename T, FMT_ENABLE_IF(std::is_enum_v<T>)>
+auto format_as(T f) { return fmt::underlying(f); }
+
 #endif

src/common/Utilities/Types.h

@@ -18,8 +18,6 @@
 #ifndef _TYPES_H_
 #define _TYPES_H_
 
-#include "advstd.h"
-
 namespace Acore
 {
     // end "iterator" tag for find_type_if
@@ -35,7 +33,7 @@ namespace Acore
     };
 
     template<template<typename...> typename Check, typename T1, typename... Ts>
-    struct find_type_if<Check, T1, Ts...> : std::conditional_t<Check<T1>::value, advstd::type_identity<T1>, find_type_if<Check, Ts...>>
+    struct find_type_if<Check, T1, Ts...> : std::conditional_t<Check<T1>::value, std::type_identity<T1>, find_type_if<Check, Ts...>>
     {
     };
 

src/common/Utilities/advstd.h

@@ -24,22 +24,6 @@
 // this namespace holds implementations of upcoming stdlib features that our c++ version doesn't have yet
 namespace advstd
 {
-    // This workaround for std::remove_cvref_t, std::type_identify is needed for GCC 8...
-    /// @todo: remove when we drop GCC 8 support. https://en.cppreference.com/w/cpp/compiler_support/20
-    // C++20 advstd::remove_cvref_t
-    template <class T>
-    using remove_cvref_t = std::remove_cv_t<std::remove_reference_t<T>>;
-
-    // C++20 std::type_identity
-    template <typename T>
-    struct type_identity
-    {
-        using type = T;
-    };
-
-    // C++20 std::type_identity_t
-    template <typename T>
-    using type_identity_t = typename type_identity<T>::type;
 }
 
 #endif // _ADV_STD_H_