From 3e9f4054740a3beb0bdc67c43e7155303189b259 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sun, 19 Mar 2023 17:58:01 +0100 Subject: [PATCH] Fix MSVC error 'C2280' and 'C2955' Fix 'attempting to reference a deleted function'. Fix 'use of class requires a template argument list'. --- r5dev/thirdparty/cppnet/cppkore/AtomicListBase.h | 4 ++-- r5dev/thirdparty/cppnet/cppkore/Console.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/r5dev/thirdparty/cppnet/cppkore/AtomicListBase.h b/r5dev/thirdparty/cppnet/cppkore/AtomicListBase.h index 43e93923..e411105d 100644 --- a/r5dev/thirdparty/cppnet/cppkore/AtomicListBase.h +++ b/r5dev/thirdparty/cppnet/cppkore/AtomicListBase.h @@ -35,7 +35,7 @@ template inline void AtomicListBase::Enqueue(T& Item) { { - std::lock_guard lock(this->_SyncContext); + std::lock_guard lock(this->_SyncContext); this->_List.EmplaceBack(Item); } @@ -46,7 +46,7 @@ template inline bool AtomicListBase::Dequeue(T& Item) { { - std::lock_guard lock(this->_SyncContext); + std::lock_guard lock(this->_SyncContext); const auto Length = this->_List.Count(); if (Length > 0) diff --git a/r5dev/thirdparty/cppnet/cppkore/Console.cpp b/r5dev/thirdparty/cppnet/cppkore/Console.cpp index 85697d48..6dc06d13 100644 --- a/r5dev/thirdparty/cppnet/cppkore/Console.cpp +++ b/r5dev/thirdparty/cppnet/cppkore/Console.cpp @@ -5,7 +5,7 @@ namespace System { // This holds the global std handle for the input stream - __ConsoleInit Console::ConsoleInstance = __ConsoleInit(); + __ConsoleInit Console::ConsoleInstance /*= __ConsoleInit()*/; enum class ControlKeyState {