From 8dc9834f488d14ac8d03cf7fd42e137edf7860c8 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 14 May 2021 09:31:10 +0200 Subject: [PATCH] Fix compilation for Linux --- Source/ThirdParty/concurrentqueue.h | 8 ++------ Source/ThirdParty/fmt/format.h | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/ThirdParty/concurrentqueue.h b/Source/ThirdParty/concurrentqueue.h index ac7ea1dc9..8f1d5b58f 100644 --- a/Source/ThirdParty/concurrentqueue.h +++ b/Source/ThirdParty/concurrentqueue.h @@ -42,7 +42,7 @@ #include "TargetConditionals.h" #endif -#include // Requires C++11. Sorry VS2010. +#include #include #include #include @@ -156,11 +156,7 @@ namespace details { : static_cast(-1); }; -#if defined(__GLIBCXX__) - typedef ::max_align_t std_max_align_t; // libstdc++ forgot to add it to std:: for a while -#else - typedef std::max_align_t std_max_align_t; // Others (e.g. MSVC) insist it can *only* be accessed via std:: -#endif + typedef std::max_align_t std_max_align_t; // Some platforms have incorrectly set max_align_t to a type with <8 bytes alignment even while supporting // 8-byte aligned scalar values (*cough* 32-bit iOS). Work around this with our own union. See issue #64. diff --git a/Source/ThirdParty/fmt/format.h b/Source/ThirdParty/fmt/format.h index 1f551a0a4..14bd692c3 100644 --- a/Source/ThirdParty/fmt/format.h +++ b/Source/ThirdParty/fmt/format.h @@ -407,7 +407,7 @@ class basic_memory_buffer: private Allocator, public internal::basic_buffer { // Move data from other to this buffer. void move(basic_memory_buffer &other) { Allocator &this_alloc = *this, &other_alloc = other; - this_alloc = std::move(other_alloc); + this_alloc = ::MoveTemp(other_alloc); T* data = other.data(); std::size_t size = other.size(), capacity = other.capacity(); if (data == other.store_) {