Merge branch 'master' into gltf

DirectXMesh/DirectXMeshP.h

@@ -119,6 +119,7 @@
 #include <map>
 #include <new>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 #include <unordered_set>
 

DirectXMesh/scoped.h

@@ -13,6 +13,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <tuple>
 
 #ifndef WIN32
 #include <cstdlib>
@@ -98,7 +99,7 @@ public:
         {
             FILE_DISPOSITION_INFO info = {};
             info.DeleteFile = TRUE;
-            (void)SetFileInformationByHandle(m_handle, FileDispositionInfo, &info, sizeof(info));
+            std::ignore = SetFileInformationByHandle(m_handle, FileDispositionInfo, &info, sizeof(info));
         }
     }
 

Meshconvert/Meshconvert.cpp

@@ -34,6 +34,7 @@
 #include <memory>
 #include <set>
 #include <string>
+#include <tuple>
 
 #include "Mesh.h"
 
@@ -685,6 +686,8 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                         return 1;
                     }
 
+                    inFile.imbue(std::locale::classic());
+
                     ProcessFileList(inFile, conversion);
                 }
                 break;
@@ -1007,7 +1010,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
 
         if (dwOptions & (1 << OPT_TOLOWER))
         {
-            (void)_wcslwr_s(outputPath);
+            std::ignore = _wcslwr_s(outputPath);
         }
 
         if (~dwOptions & (1 << OPT_OVERWRITE))

Utilities/WaveFrontReader.h

@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <cstdint>
 #include <fstream>
+#include <locale>
 #include <string>
 #include <vector>
 #include <unordered_map>
@@ -66,7 +67,7 @@ public:
     {
         Clear();
 
-        static const size_t MAX_POLY = 64;
+        constexpr size_t MAX_POLY = 64;
 
         using namespace DirectX;
 
@@ -74,6 +75,8 @@ public:
         if (!InFile)
             return /* HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) */ static_cast<HRESULT>(0x80070002L);
 
+        InFile.imbue(std::locale::classic());
+
 #ifdef WIN32
         wchar_t fname[_MAX_FNAME] = {};
         _wsplitpath_s(szFileName, nullptr, 0, nullptr, 0, fname, _MAX_FNAME, nullptr, 0);
@@ -417,6 +420,8 @@ public:
         if (!InFile)
             return /* HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) */ static_cast<HRESULT>(0x80070002L);
 
+        InFile.imbue(std::locale::classic());
+
         auto curMaterial = materials.end();
 
         for (;; )