Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-16 06:50:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't need to use DIRECTX_NOEXCEPT macro

Browse Source
This commit is contained in:
Chuck Walbourn 2018-04-17 10:49:53 -07:00
parent cdeb3fe508
commit 32619fb627
7 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DirectXTex/BCDirectCompute.cpp
View File

@ -79,7 +79,7 @@ namespace
} }
}; };
GPUCompressBC::GPUCompressBC() DIRECTX_NOEXCEPT : GPUCompressBC::GPUCompressBC() throw() :
m_bcformat(DXGI_FORMAT_UNKNOWN), m_bcformat(DXGI_FORMAT_UNKNOWN),
m_srcformat(DXGI_FORMAT_UNKNOWN), m_srcformat(DXGI_FORMAT_UNKNOWN),
m_alphaWeight(1.f), m_alphaWeight(1.f),

2
DirectXTex/BCDirectCompute.h
View File

@ -15,7 +15,7 @@ namespace DirectX
class GPUCompressBC class GPUCompressBC
{ {
public: public:
GPUCompressBC() DIRECTX_NOEXCEPT; GPUCompressBC() throw();
HRESULT Initialize(_In_ ID3D11Device* pDevice); HRESULT Initialize(_In_ ID3D11Device* pDevice);

19
DirectXTex/DirectXTex.h
View File

@ -35,13 +35,6 @@
struct IWICImagingFactory; struct IWICImagingFactory;
struct IWICMetadataQueryReader; struct IWICMetadataQueryReader;
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX namespace DirectX
{ {
@ -264,13 +257,13 @@ namespace DirectX
class ScratchImage class ScratchImage
{ {
public: public:
ScratchImage() DIRECTX_NOEXCEPT ScratchImage() throw()
: m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) {} : 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); } : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) { *this = std::move(moveFrom); }
~ScratchImage() { Release(); } ~ScratchImage() { Release(); }
ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) DIRECTX_NOEXCEPT; ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) throw();
ScratchImage(const ScratchImage&) = delete; ScratchImage(const ScratchImage&) = delete;
ScratchImage& operator=(const ScratchImage&) = delete; ScratchImage& operator=(const ScratchImage&) = delete;
@ -315,11 +308,11 @@ namespace DirectX
class Blob class Blob
{ {
public: public:
Blob() DIRECTX_NOEXCEPT : m_buffer(nullptr), m_size(0) {} Blob() throw() : m_buffer(nullptr), m_size(0) {}
Blob(Blob&& moveFrom) DIRECTX_NOEXCEPT : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); } Blob(Blob&& moveFrom) throw() : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); }
~Blob() { Release(); } ~Blob() { Release(); }
Blob& __cdecl operator= (Blob&& moveFrom) DIRECTX_NOEXCEPT; Blob& __cdecl operator= (Blob&& moveFrom) throw();
Blob(const Blob&) = delete; Blob(const Blob&) = delete;
Blob& operator=(const Blob&) = delete; Blob& operator=(const Blob&) = delete;

2
DirectXTex/DirectXTexConvert.cpp
View File

@ -2882,7 +2882,7 @@ namespace
}; };
#pragma prefast( suppress : 25004, "Signature must match bsearch_s" ); #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); UNREFERENCED_PARAMETER(context);
auto p1 = static_cast<const ConvertData*>(ptr1); auto p1 = static_cast<const ConvertData*>(ptr1);

2
DirectXTex/DirectXTexImage.cpp
View File

@ -234,7 +234,7 @@ bool DirectX::_SetupImageArray(
// ScratchImage - Bitmap image container // ScratchImage - Bitmap image container
//===================================================================================== //=====================================================================================
ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) DIRECTX_NOEXCEPT ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) throw()
{ {
if (this != &moveFrom) if (this != &moveFrom)
{ {

4
DirectXTex/DirectXTexUtil.cpp
View File

@ -236,7 +236,7 @@ IWICImagingFactory* DirectX::GetWICFactory(bool& iswic2)
static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT; static INIT_ONCE s_initOnce = INIT_ONCE_STATIC_INIT;
InitOnceExecuteOnce(&s_initOnce, 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) #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
HRESULT hr = CoCreateInstance( 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 - Bitmap image container
//===================================================================================== //=====================================================================================
Blob& Blob::operator= (Blob&& moveFrom) DIRECTX_NOEXCEPT Blob& Blob::operator= (Blob&& moveFrom) throw()
{ {
if (this != &moveFrom) if (this != &moveFrom)
{ {

2
DirectXTex/Filters.h
View File

@ -237,7 +237,7 @@ namespace TriangleFilter
TriangleRow* next; TriangleRow* next;
ScopedAlignedArrayXMVECTOR scanline; 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); static const size_t TF_FILTER_SIZE = sizeof(Filter) - sizeof(FilterFrom);