diff --git a/DirectXTex/BCDirectCompute.cpp b/DirectXTex/BCDirectCompute.cpp index c99371a..3f8713f 100644 --- a/DirectXTex/BCDirectCompute.cpp +++ b/DirectXTex/BCDirectCompute.cpp @@ -79,7 +79,7 @@ namespace } }; -GPUCompressBC::GPUCompressBC() DIRECTX_NOEXCEPT : +GPUCompressBC::GPUCompressBC() throw() : m_bcformat(DXGI_FORMAT_UNKNOWN), m_srcformat(DXGI_FORMAT_UNKNOWN), m_alphaWeight(1.f), diff --git a/DirectXTex/BCDirectCompute.h b/DirectXTex/BCDirectCompute.h index 8048769..9a4a6ff 100644 --- a/DirectXTex/BCDirectCompute.h +++ b/DirectXTex/BCDirectCompute.h @@ -15,7 +15,7 @@ namespace DirectX class GPUCompressBC { public: - GPUCompressBC() DIRECTX_NOEXCEPT; + GPUCompressBC() throw(); HRESULT Initialize(_In_ ID3D11Device* pDevice); diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h index 13135c4..52894e3 100644 --- a/DirectXTex/DirectXTex.h +++ b/DirectXTex/DirectXTex.h @@ -35,13 +35,6 @@ struct IWICImagingFactory; struct IWICMetadataQueryReader; -#ifndef DIRECTX_NOEXCEPT -#if defined(_MSC_VER) && (_MSC_VER < 1900) -#define DIRECTX_NOEXCEPT -#else -#define DIRECTX_NOEXCEPT noexcept -#endif -#endif namespace DirectX { @@ -264,13 +257,13 @@ namespace DirectX class ScratchImage { public: - ScratchImage() DIRECTX_NOEXCEPT + ScratchImage() throw() : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) {} - ScratchImage(ScratchImage&& moveFrom) DIRECTX_NOEXCEPT + ScratchImage(ScratchImage&& moveFrom) throw() : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) { *this = std::move(moveFrom); } ~ScratchImage() { Release(); } - ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) DIRECTX_NOEXCEPT; + ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) throw(); ScratchImage(const ScratchImage&) = delete; ScratchImage& operator=(const ScratchImage&) = delete; @@ -315,11 +308,11 @@ namespace DirectX class Blob { public: - Blob() DIRECTX_NOEXCEPT : m_buffer(nullptr), m_size(0) {} - Blob(Blob&& moveFrom) DIRECTX_NOEXCEPT : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); } + Blob() throw() : m_buffer(nullptr), m_size(0) {} + Blob(Blob&& moveFrom) throw() : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); } ~Blob() { Release(); } - Blob& __cdecl operator= (Blob&& moveFrom) DIRECTX_NOEXCEPT; + Blob& __cdecl operator= (Blob&& moveFrom) throw(); Blob(const Blob&) = delete; Blob& operator=(const Blob&) = delete; diff --git a/DirectXTex/DirectXTexConvert.cpp b/DirectXTex/DirectXTexConvert.cpp index c0e6a5f..180efa8 100644 --- a/DirectXTex/DirectXTexConvert.cpp +++ b/DirectXTex/DirectXTexConvert.cpp @@ -2882,7 +2882,7 @@ namespace }; #pragma prefast( suppress : 25004, "Signature must match bsearch_s" ); - int __cdecl ConvertCompare(void *context, const void* ptr1, const void *ptr2) DIRECTX_NOEXCEPT + int __cdecl ConvertCompare(void *context, const void* ptr1, const void *ptr2) throw() { UNREFERENCED_PARAMETER(context); auto p1 = static_cast(ptr1); diff --git a/DirectXTex/DirectXTexImage.cpp b/DirectXTex/DirectXTexImage.cpp index 0eec952..abc8590 100644 --- a/DirectXTex/DirectXTexImage.cpp +++ b/DirectXTex/DirectXTexImage.cpp @@ -234,7 +234,7 @@ bool DirectX::_SetupImageArray( // ScratchImage - Bitmap image container //===================================================================================== -ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) DIRECTX_NOEXCEPT +ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) throw() { if (this != &moveFrom) { diff --git a/DirectXTex/DirectXTexUtil.cpp b/DirectXTex/DirectXTexUtil.cpp index c718efe..b6ce004 100644 --- a/DirectXTex/DirectXTexUtil.cpp +++ b/DirectXTex/DirectXTexUtil.cpp @@ -236,7 +236,7 @@ IWICImagingFactory* DirectX::GetWICFactory(bool& iswic2) static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT; InitOnceExecuteOnce(&s_initOnce, - [](PINIT_ONCE, PVOID, LPVOID *factory) DIRECTX_NOEXCEPT -> BOOL + [](PINIT_ONCE, PVOID, LPVOID *factory) throw() -> BOOL { #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE) HRESULT hr = CoCreateInstance( @@ -1413,7 +1413,7 @@ size_t TexMetadata::ComputeIndex(size_t mip, size_t item, size_t slice) const // Blob - Bitmap image container //===================================================================================== -Blob& Blob::operator= (Blob&& moveFrom) DIRECTX_NOEXCEPT +Blob& Blob::operator= (Blob&& moveFrom) throw() { if (this != &moveFrom) { diff --git a/DirectXTex/Filters.h b/DirectXTex/Filters.h index 238f817..0c5cdeb 100644 --- a/DirectXTex/Filters.h +++ b/DirectXTex/Filters.h @@ -237,7 +237,7 @@ namespace TriangleFilter TriangleRow* next; ScopedAlignedArrayXMVECTOR scanline; - TriangleRow() DIRECTX_NOEXCEPT : remaining(0), next(nullptr) {} + TriangleRow() throw() : remaining(0), next(nullptr) {} }; static const size_t TF_FILTER_SIZE = sizeof(Filter) - sizeof(FilterFrom);