From 83598824012a77184778ed706ffac70a7bada489 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 30 May 2020 22:14:59 -0700 Subject: [PATCH] functions taking std::function should not be noexcept --- ScreenGrab/ScreenGrab11.cpp | 2 +- ScreenGrab/ScreenGrab11.h | 2 +- ScreenGrab/ScreenGrab12.cpp | 2 +- ScreenGrab/ScreenGrab12.h | 2 +- ScreenGrab/ScreenGrab9.cpp | 2 +- ScreenGrab/ScreenGrab9.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ScreenGrab/ScreenGrab11.cpp b/ScreenGrab/ScreenGrab11.cpp index 8220973..9e9b340 100644 --- a/ScreenGrab/ScreenGrab11.cpp +++ b/ScreenGrab/ScreenGrab11.cpp @@ -947,7 +947,7 @@ HRESULT DirectX::SaveWICTextureToFile( const wchar_t* fileName, const GUID* targetFormat, std::function setCustomProps, - bool forceSRGB) noexcept + bool forceSRGB) { if (!fileName) return E_INVALIDARG; diff --git a/ScreenGrab/ScreenGrab11.h b/ScreenGrab/ScreenGrab11.h index 4c02c33..1aa09e2 100644 --- a/ScreenGrab/ScreenGrab11.h +++ b/ScreenGrab/ScreenGrab11.h @@ -37,5 +37,5 @@ namespace DirectX _In_z_ const wchar_t* fileName, _In_opt_ const GUID* targetFormat = nullptr, _In_opt_ std::function setCustomProps = nullptr, - _In_ bool forceSRGB = false) noexcept; + _In_ bool forceSRGB = false); } diff --git a/ScreenGrab/ScreenGrab12.cpp b/ScreenGrab/ScreenGrab12.cpp index 96eb5c4..6a7057f 100644 --- a/ScreenGrab/ScreenGrab12.cpp +++ b/ScreenGrab/ScreenGrab12.cpp @@ -1058,7 +1058,7 @@ HRESULT DirectX::SaveWICTextureToFile( D3D12_RESOURCE_STATES afterState, const GUID* targetFormat, std::function setCustomProps, - bool forceSRGB) noexcept + bool forceSRGB) { if (!fileName) return E_INVALIDARG; diff --git a/ScreenGrab/ScreenGrab12.h b/ScreenGrab/ScreenGrab12.h index 573c8de..b44ed1e 100644 --- a/ScreenGrab/ScreenGrab12.h +++ b/ScreenGrab/ScreenGrab12.h @@ -41,5 +41,5 @@ namespace DirectX D3D12_RESOURCE_STATES afterState = D3D12_RESOURCE_STATE_RENDER_TARGET, _In_opt_ const GUID* targetFormat = nullptr, _In_opt_ std::function setCustomProps = nullptr, - bool forceSRGB = false) noexcept; + bool forceSRGB = false); } diff --git a/ScreenGrab/ScreenGrab9.cpp b/ScreenGrab/ScreenGrab9.cpp index 3678928..6071a63 100644 --- a/ScreenGrab/ScreenGrab9.cpp +++ b/ScreenGrab/ScreenGrab9.cpp @@ -737,7 +737,7 @@ HRESULT DirectX::SaveWICTextureToFile( REFGUID guidContainerFormat, const wchar_t* fileName, const GUID* targetFormat, - std::function setCustomProps) noexcept + std::function setCustomProps) { if (!pSource || !fileName) return E_INVALIDARG; diff --git a/ScreenGrab/ScreenGrab9.h b/ScreenGrab/ScreenGrab9.h index 93ce1c5..9ada0ad 100644 --- a/ScreenGrab/ScreenGrab9.h +++ b/ScreenGrab/ScreenGrab9.h @@ -38,5 +38,5 @@ namespace DirectX _In_ REFGUID guidContainerFormat, _In_z_ const wchar_t* fileName, _In_opt_ const GUID* targetFormat = nullptr, - _In_opt_ std::function setCustomProps = nullptr) noexcept; + _In_opt_ std::function setCustomProps = nullptr); }