Removed obsolete adapter code for VS 2010/2012

DirectXMesh/DirectXMesh.h

@@ -15,16 +15,12 @@
 
 #pragma once
 
-// VS 2010's stdint.h conflicts with intsafe.h
-#pragma warning(push)
-#pragma warning(disable : 4005)
-#include <stdint.h>
-#pragma warning(pop)
-
 #include <memory>
 #include <string>
 #include <vector>
 
+#include <stdint.h>
+
 #if defined(_XBOX_ONE) && defined(_TITLE)
 #include <d3d11_x.h>
 #define DCOMMON_H_INCLUDED
@@ -32,17 +28,6 @@
 #include <d3d11_1.h>
 #endif
 
-// VS 2010/2012 do not support =default =delete
-#ifndef DIRECTX_CTOR_DEFAULT
-#if defined(_MSC_VER) && (_MSC_VER < 1800)
-#define DIRECTX_CTOR_DEFAULT {}
-#define DIRECTX_CTOR_DELETE ;
-#else
-#define DIRECTX_CTOR_DEFAULT =default;
-#define DIRECTX_CTOR_DELETE =delete;
-#endif
-#endif
-
 #include <directxmath.h>
 
 #define DIRECTX_MESH_VERSION 101
@@ -85,6 +70,10 @@ namespace DirectX
         VBReader();
         VBReader(VBReader&& moveFrom);
         VBReader& operator= (VBReader&& moveFrom);
+
+        VBReader(VBReader const&) = delete;
+        VBReader& operator= (VBReader const&) = delete;
+
         ~VBReader();
 
         HRESULT __cdecl Initialize( _In_reads_(nDecl) const D3D11_INPUT_ELEMENT_DESC* vbDecl, _In_ size_t nDecl );
@@ -111,10 +100,6 @@ namespace DirectX
         class Impl;
 
         std::unique_ptr<Impl> pImpl;
-
-        // Prevent copying.
-        VBReader(VBReader const&) DIRECTX_CTOR_DELETE
-        VBReader& operator= (VBReader const&) DIRECTX_CTOR_DELETE
     };
 
     class VBWriter
@@ -123,6 +108,10 @@ namespace DirectX
         VBWriter();
         VBWriter(VBWriter&& moveFrom);
         VBWriter& operator= (VBWriter&& moveFrom);
+
+        VBWriter(VBWriter const&) = delete;
+        VBWriter& operator= (VBWriter const&) = delete;
+
         ~VBWriter();
 
         HRESULT __cdecl Initialize( _In_reads_(nDecl) const D3D11_INPUT_ELEMENT_DESC* vbDecl, _In_ size_t nDecl );
@@ -149,10 +138,6 @@ namespace DirectX
         class Impl;
 
         std::unique_ptr<Impl> pImpl;
-
-        // Prevent copying.
-        VBWriter(VBWriter const&) DIRECTX_CTOR_DELETE
-        VBWriter& operator= (VBWriter const&) DIRECTX_CTOR_DELETE
     };
 
     //---------------------------------------------------------------------------------

Meshconvert/Mesh.h

@@ -19,10 +19,7 @@
 #include <string>
 #include <vector>
 
-#pragma warning(push)
-#pragma warning(disable : 4005)
 #include <stdint.h>
-#pragma warning(pop)
 
 #if defined(_XBOX_ONE) && defined(_TITLE)
 #include <d3d11_x.h>
@@ -42,6 +39,9 @@ public:
     Mesh(Mesh&& moveFrom);
     Mesh& operator= (Mesh&& moveFrom);
 
+    Mesh(Mesh const&) = delete;
+    Mesh& operator= (Mesh const&) = delete;
+
     // Methods
     void Clear();
 
@@ -121,8 +121,4 @@ private:
     std::unique_ptr<DirectX::XMFLOAT4[]>        mColors;
     std::unique_ptr<DirectX::XMFLOAT4[]>        mBlendIndices;
     std::unique_ptr<DirectX::XMFLOAT4[]>        mBlendWeights;
-
-    // Prevent copying
-    Mesh(Mesh const&) DIRECTX_CTOR_DELETE
-    Mesh& operator= (Mesh const&) DIRECTX_CTOR_DELETE
 };

Utilities/WaveFrontReader.h

@@ -23,10 +23,7 @@
 #include <vector>
 #include <unordered_map>
 
-#pragma warning(push)
-#pragma warning(disable : 4005)
 #include <stdint.h>
-#pragma warning(pop)
 
 #include <directxmath.h>
 #include <directxcollision.h>