Merge branch 'master' into LoadBalancingExperiments2

Author: robertosfield

include/vsg/core/Export.h

@@ -16,7 +16,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #    pragma warning(disable : 4251)
 #endif
 
-#if defined(WIN32)
+#if defined(_WIN32)
 #    if defined(vsg_EXPORTS)
 #        define VSG_DECLSPEC __declspec(dllexport)
 #    elif defined(VSG_SHARED_LIBRARY)

include/vsg/core/IntrusiveAllocator.h

@@ -106,6 +106,7 @@ namespace vsg
 
                 Element() = default;
                 Element(const Element&) = default;
+                Element& operator=(const Element&) = default;
             };
 
             struct FreeList

include/vsg/platform/win32/Win32_Window.h

@@ -41,7 +41,6 @@ namespace vsgWin32
             uint16_t modifierMask = 0;
 
             // see https://learn.microsoft.com/en-us/windows/win32/inputdev/about-keyboard-input#keystroke-message-flags
-            WORD vkCode = LOWORD(wParam); // virtual-key code
             WORD keyFlags = HIWORD(lParam);
             WORD scanCode = LOBYTE(keyFlags);                             // scan code
             BOOL isExtendedKey = (keyFlags & KF_EXTENDED) == KF_EXTENDED; // extended-key flag, 1 if scancode has 0xE0 prefix

include/vsg/vk/State.h

@@ -19,7 +19,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <vsg/vk/CommandBuffer.h>
 
 #include <array>
-#include <map>
 #include <stack>
 
 namespace vsg
@@ -33,7 +32,8 @@ namespace vsg
     class StateStack
     {
     public:
-        StateStack() {}
+        StateStack() = default;
+        StateStack(const StateStack& rhs) = default;
 
         using Stack = std::array<const T*, STATESTACK_SIZE>;
         Stack stack;

src/vsg/io/FileSystem.cpp

@@ -17,7 +17,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #include <cstdio>
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
 #    include <cstdlib>
 #    include <direct.h>
 #    include <io.h>
@@ -223,7 +223,7 @@ Path vsg::executableFilePath()
 {
     Path path;
 
-#if defined(WIN32)
+#if defined(_WIN32)
     TCHAR buf[PATH_MAX + 1];
     DWORD result = GetModuleFileName(NULL, buf, static_cast<DWORD>(std::size(buf) - 1));
     if (result && result < std::size(buf))

src/vsg/utils/PolytopeIntersector.cpp

@@ -78,7 +78,6 @@ namespace vsg
             {
                 size_t numNegativeDistances = 0;
                 size_t numPositiveDistances = 0;
-                size_t numZeroDistances = 0;
                 processedDistances.resize(0);
                 for (const auto& v : processedVertices)
                 {
@@ -88,8 +87,6 @@ namespace vsg
                         ++numNegativeDistances;
                     else if (d > 0.0)
                         ++numPositiveDistances;
-                    else
-                        ++numZeroDistances;
                 }
 
                 if (numNegativeDistances > 0)