diff options
Diffstat (limited to 'lib/win32/Effects11/inc/d3dxGlobal.h')
| -rw-r--r-- | lib/win32/Effects11/inc/d3dxGlobal.h | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/lib/win32/Effects11/inc/d3dxGlobal.h b/lib/win32/Effects11/inc/d3dxGlobal.h index bdd738c311..688b003773 100644 --- a/lib/win32/Effects11/inc/d3dxGlobal.h +++ b/lib/win32/Effects11/inc/d3dxGlobal.h @@ -3,12 +3,8 @@ // // Direct3D 11 Effects helper defines and data structures // -// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY OF -// ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A -// PARTICULAR PURPOSE. -// // Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. // // http://go.microsoft.com/fwlink/p/?LinkId=271568 //-------------------------------------------------------------------------------------- @@ -118,13 +114,13 @@ public: size_t GetPosition(); HRESULT Seek(_In_ size_t offset); - CMemoryStream(); + CMemoryStream() noexcept; ~CMemoryStream(); }; } -#if defined(_DEBUG) && !defined(_M_X64) +#if defined(_DEBUG) && !defined(_M_X64) && !defined(_M_ARM64) namespace D3DX11Debug { @@ -200,7 +196,11 @@ protected: public: HRESULT m_hLastError; - CEffectVector<T>() : m_hLastError(S_OK), m_pData(nullptr), m_CurSize(0), m_MaxSize(0) + CEffectVector<T>() noexcept : + m_hLastError(S_OK), + m_pData(nullptr), + m_CurSize(0), + m_MaxSize(0) { #if _DEBUG m_pCastData = nullptr; @@ -477,7 +477,9 @@ template <class T, T MaxValue> class CheckedNumber bool m_bValid; public: - CheckedNumber<T, MaxValue>() : m_Value(0), m_bValid(true) + CheckedNumber<T, MaxValue>() noexcept : + m_Value(0), + m_bValid(true) { } @@ -580,7 +582,7 @@ public: void EnableAlignment(); - CDataBlock(); + CDataBlock() noexcept; ~CDataBlock(); friend class CDataBlockStore; @@ -613,7 +615,7 @@ public: uint32_t GetSize(); void EnableAlignment(); - CDataBlockStore(); + CDataBlockStore() noexcept; ~CDataBlockStore(); }; @@ -838,7 +840,11 @@ public: } }; - CEffectHashTable() : m_rgpHashEntries(nullptr), m_NumHashSlots(0), m_NumEntries(0), m_bOwnHashEntryArray(false) + CEffectHashTable() noexcept : + m_rgpHashEntries(nullptr), + m_NumHashSlots(0), + m_NumEntries(0), + m_bOwnHashEntryArray(false) { } @@ -1234,9 +1240,9 @@ protected: CDataBlockStore *m_pPrivateHeap; public: - CEffectHashTableWithPrivateHeap() + CEffectHashTableWithPrivateHeap() noexcept : + m_pPrivateHeap(nullptr) { - m_pPrivateHeap = nullptr; } void Cleanup() |