From 820fe04a0ef94cd952084101a032030086c04ca4 Mon Sep 17 00:00:00 2001 From: "Bernhart, Bryan" Date: Thu, 30 Mar 2023 10:16:50 -0700 Subject: [PATCH] Disable exceptions where thrown. Fixes for Coverity scans #799 --- src/gpgmm/common/EventTraceWriter.cpp | 4 ++-- src/gpgmm/common/EventTraceWriter.h | 4 ++-- src/gpgmm/d3d12/ErrorD3D12.cpp | 2 +- src/gpgmm/d3d12/ErrorD3D12.h | 2 +- src/gpgmm/utils/JSONEncoder.cpp | 4 ++-- src/gpgmm/utils/JSONEncoder.h | 4 ++-- src/gpgmm/utils/Log.cpp | 2 +- src/gpgmm/utils/Log.h | 4 ++-- src/gpgmm/utils/Utils.h | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gpgmm/common/EventTraceWriter.cpp b/src/gpgmm/common/EventTraceWriter.cpp index a6114b8a5..2b0ce9b0b 100644 --- a/src/gpgmm/common/EventTraceWriter.cpp +++ b/src/gpgmm/common/EventTraceWriter.cpp @@ -64,7 +64,7 @@ namespace gpgmm { std::vector mBuffer; }; - EventTraceWriter::EventTraceWriter() + EventTraceWriter::EventTraceWriter() noexcept : mTraceFile(kDefaultTraceFile), mIgnoreMask(TraceEventPhase::None), mPlatformTime(CreatePlatformTime()) { @@ -95,7 +95,7 @@ namespace gpgmm { } } - void EventTraceWriter::FlushQueuedEventsToDisk() { + void EventTraceWriter::FlushQueuedEventsToDisk() noexcept { std::unique_lock lock(mMutex); JSONArray traceEvents; diff --git a/src/gpgmm/common/EventTraceWriter.h b/src/gpgmm/common/EventTraceWriter.h index 7ecc4eb29..8776824fe 100644 --- a/src/gpgmm/common/EventTraceWriter.h +++ b/src/gpgmm/common/EventTraceWriter.h @@ -29,7 +29,7 @@ namespace gpgmm { class EventTraceWriter { public: - EventTraceWriter(); + EventTraceWriter() noexcept; ~EventTraceWriter(); void SetConfiguration(const char* traceFile, const TraceEventPhase& ignoreMask); @@ -42,7 +42,7 @@ namespace gpgmm { uint32_t flags, const JSONDict& args); - void FlushQueuedEventsToDisk(); + void FlushQueuedEventsToDisk() noexcept; void FlushAndRemoveBufferEntry(std::vector* buffer); diff --git a/src/gpgmm/d3d12/ErrorD3D12.cpp b/src/gpgmm/d3d12/ErrorD3D12.cpp index 275221af5..188cef4e7 100644 --- a/src/gpgmm/d3d12/ErrorD3D12.cpp +++ b/src/gpgmm/d3d12/ErrorD3D12.cpp @@ -23,7 +23,7 @@ namespace gpgmm::d3d12 { - std::string GetErrorMessage(HRESULT error) { + std::string GetErrorMessage(HRESULT error) noexcept { std::wstring wstring = TCharToWString(_com_error(error).ErrorMessage()); std::stringstream ss; ss << WCharToUTF8(wstring.c_str()) << " (0x" << std::hex << std::uppercase diff --git a/src/gpgmm/d3d12/ErrorD3D12.h b/src/gpgmm/d3d12/ErrorD3D12.h index 03bd7dfce..3bba7fbca 100644 --- a/src/gpgmm/d3d12/ErrorD3D12.h +++ b/src/gpgmm/d3d12/ErrorD3D12.h @@ -73,7 +73,7 @@ namespace gpgmm::d3d12 { #define AssertIfSucceded(expr) ASSERT(FAILED(expr)); std::string GetDeviceErrorMessage(ID3D12Device* device, HRESULT error); - std::string GetErrorMessage(HRESULT error); + std::string GetErrorMessage(HRESULT error) noexcept; } // namespace gpgmm::d3d12 diff --git a/src/gpgmm/utils/JSONEncoder.cpp b/src/gpgmm/utils/JSONEncoder.cpp index fc2c233c4..0230b82d1 100644 --- a/src/gpgmm/utils/JSONEncoder.cpp +++ b/src/gpgmm/utils/JSONEncoder.cpp @@ -18,7 +18,7 @@ namespace gpgmm { // JSONDict - JSONDict::JSONDict() { + JSONDict::JSONDict() noexcept { mSS << "{ "; } @@ -106,7 +106,7 @@ namespace gpgmm { // JSONArray - JSONArray::JSONArray() { + JSONArray::JSONArray() noexcept { mSS << "[ "; } diff --git a/src/gpgmm/utils/JSONEncoder.h b/src/gpgmm/utils/JSONEncoder.h index 99902f3a4..7479e9ea4 100644 --- a/src/gpgmm/utils/JSONEncoder.h +++ b/src/gpgmm/utils/JSONEncoder.h @@ -24,7 +24,7 @@ namespace gpgmm { class JSONDict { public: - JSONDict(); + JSONDict() noexcept; JSONDict(const std::string& name, const JSONDict& object); JSONDict(const JSONDict& other); JSONDict& operator=(const JSONDict& other); @@ -55,7 +55,7 @@ namespace gpgmm { class JSONArray { public: - JSONArray(); + JSONArray() noexcept; JSONArray(const JSONArray& other); JSONArray& operator=(const JSONArray& other); diff --git a/src/gpgmm/utils/Log.cpp b/src/gpgmm/utils/Log.cpp index beb202291..a069eb723 100644 --- a/src/gpgmm/utils/Log.cpp +++ b/src/gpgmm/utils/Log.cpp @@ -95,7 +95,7 @@ namespace gpgmm { // LogMessage - LogMessage::LogMessage(MessageSeverity severity, MessageId messageId) + LogMessage::LogMessage(MessageSeverity severity, MessageId messageId) noexcept : mSeverity(severity), mMessageId(messageId) { } diff --git a/src/gpgmm/utils/Log.h b/src/gpgmm/utils/Log.h index 4d98cb598..06e6eb764 100644 --- a/src/gpgmm/utils/Log.h +++ b/src/gpgmm/utils/Log.h @@ -57,14 +57,14 @@ namespace gpgmm { // Essentially an ostringstream that will print itself in its destructor. class LogMessage { public: - LogMessage(MessageSeverity severity, MessageId messageId); + LogMessage(MessageSeverity severity, MessageId messageId) noexcept; ~LogMessage(); LogMessage(LogMessage&& other) = default; LogMessage& operator=(LogMessage&& other) = default; template - LogMessage& operator<<(T&& value) { + LogMessage& operator<<(T&& value) noexcept { mStream << value; return *this; } diff --git a/src/gpgmm/utils/Utils.h b/src/gpgmm/utils/Utils.h index eea067974..258d43b67 100644 --- a/src/gpgmm/utils/Utils.h +++ b/src/gpgmm/utils/Utils.h @@ -44,7 +44,7 @@ namespace gpgmm { std::string ToString(const void* object); template - std::string ToString(T object) { + std::string ToString(T object) noexcept { std::stringstream output; output << object; return output.str(); @@ -52,7 +52,7 @@ namespace gpgmm { // Converts T to a hexadecimal string. template - std::string ToHexStr(T object) { + std::string ToHexStr(T object) noexcept { std::stringstream stream; stream << "0x" << std::hex << object; return stream.str();