GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Linux build

Browse Source
This commit is contained in:
Wojtek Figat
2021-05-13 16:23:24 +02:00
parent b2ecceab44
commit 13a6de8645
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Engine/Profiler/ProfilerCPU.h
View File

@@ -387,7 +387,6 @@ struct TIsPODType<ProfilerCPU::Event>
#define PROFILE_CPU() ZoneTransient(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(TEXT(__FUNCTION__))
#else
#define PROFILE_CPU() ZoneNamed(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(TEXT(__FUNCTION__))
#endif
#else
@@ -395,7 +394,7 @@ struct TIsPODType<ProfilerCPU::Event>
#if USE_EDITOR
#define PROFILE_CPU() ZoneTransient(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(__FUNCTION__)
#else
#define PROFILE_CPU() ZoneNamed(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(_functionNameBuffer)
#define PROFILE_CPU() ZoneNamed(___tracy_scoped_zone, true); ScopeProfileBlockCPU ProfileBlockCPU(__FUNCTION__)
#endif
#endif

7
Source/ThirdParty/fmt/core.h vendored
View File

@@ -11,6 +11,7 @@
// Custom configuration for Flax
#include "Engine/Platform/Platform.h"
#include "Engine/Platform/StringUtils.h"
#include "Engine/Core/Templates.h"
#include "Engine/Core/Memory/StlWrapper.h"
#define FMT_USE_CONSTEXPR11 0
#define FMT_USE_USER_DEFINED_LITERALS 0
@@ -966,7 +967,7 @@ FMT_CONSTEXPR typename internal::result_of<Visitor(int)>::type
template <typename Visitor, typename Context>
FMT_CONSTEXPR typename internal::result_of<Visitor(int)>::type
visit(Visitor &&vis, const basic_format_arg<Context> &arg) {
return visit_format_arg(std::forward<Visitor>(vis), arg);
return visit_format_arg(::Forward<Visitor>(vis), arg);
}
// Parsing context consisting of a format string range being parsed and an
@@ -1391,12 +1392,12 @@ class basic_format_args {
struct format_args : basic_format_args<format_context> {
template <typename ...Args>
format_args(Args &&... arg)
: basic_format_args<format_context>(std::forward<Args>(arg)...) {}
: basic_format_args<format_context>(::Forward<Args>(arg)...) {}
};
struct wformat_args : basic_format_args<wformat_context> {
template <typename ...Args>
wformat_args(Args &&... arg)
: basic_format_args<wformat_context>(std::forward<Args>(arg)...) {}
: basic_format_args<wformat_context>(::Forward<Args>(arg)...) {}
};
#define FMT_ENABLE_IF_T(B, T) typename std::enable_if<B, T>::type

6
Source/ThirdParty/fmt/format.h vendored
View File

@@ -2784,8 +2784,8 @@ struct udl_formatter {
template <typename... Args>
auto operator()(Args &&... args) const
-> decltype(format(str, std::forward<Args>(args)...)) {
return format(str, std::forward<Args>(args)...);
-> decltype(format(str, ::Forward<Args>(args)...)) {
return format(str, ::Forward<Args>(args)...);
}
};
# endif // FMT_UDL_TEMPLATE
@@ -2796,7 +2796,7 @@ struct udl_arg {
template <typename T>
named_arg<T, Char> operator=(T &&value) const {
return {str, std::forward<T>(value)};
return {str, ::Forward<T>(value)};
}
};