From e31b0c1803d976e29b258c7307e32fd0d63821e5 Mon Sep 17 00:00:00 2001 From: Yasha Jannoo Date: Thu, 12 Sep 2019 00:41:34 +0100 Subject: Fix ill-formed and warning-causing new overloaded and delete operators From VS2015 onwards, overloaded new and delete operators were no longer allowed to be declared inline. See https://docs.microsoft.com/en-us/cpp/porting/visual-cpp-what-s-new-2003-through-2015?view=vs-2019. As a consequence of moving the definitions into source files, we cannot simply include the headers in the files they are required in without also either creating a static library or including the source files in the projects. Do the latter as the pattern fits other examples of dependencies across projects in the solution. The overloaded operator definitions could be made neater in a future change. For now they are written as their declarations appear in the header file, with the same ifdefs as in the header file. --- Magic2/Magic.vcxproj | 2 ++ Magic2/Magic.vcxproj.filters | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'Magic2') diff --git a/Magic2/Magic.vcxproj b/Magic2/Magic.vcxproj index d1cac69..cda41e0 100644 --- a/Magic2/Magic.vcxproj +++ b/Magic2/Magic.vcxproj @@ -699,6 +699,7 @@ + @@ -825,6 +826,7 @@ + diff --git a/Magic2/Magic.vcxproj.filters b/Magic2/Magic.vcxproj.filters index 1ed7515..a6b3503 100644 --- a/Magic2/Magic.vcxproj.filters +++ b/Magic2/Magic.vcxproj.filters @@ -315,6 +315,9 @@ Source Files + + Source Files + @@ -403,6 +406,9 @@ Header Files + + Header Files + -- cgit v1.1