From 666be6912bd38bfe4bb0f244d619c78c2f100b27 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 21 Feb 2017 14:46:25 -0500 Subject: [PATCH] fix KTX gcc errors --- libraries/ktx/src/ktx/KTX.h | 1 + libraries/ktx/src/ktx/Reader.cpp | 6 ++---- libraries/ktx/src/ktx/Writer.cpp | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libraries/ktx/src/ktx/KTX.h b/libraries/ktx/src/ktx/KTX.h index 128d92ccc8..94529d6e68 100644 --- a/libraries/ktx/src/ktx/KTX.h +++ b/libraries/ktx/src/ktx/KTX.h @@ -16,6 +16,7 @@ #include #include #include +#include #include /* KTX Spec: diff --git a/libraries/ktx/src/ktx/Reader.cpp b/libraries/ktx/src/ktx/Reader.cpp index dffe6cf828..584bf219c4 100644 --- a/libraries/ktx/src/ktx/Reader.cpp +++ b/libraries/ktx/src/ktx/Reader.cpp @@ -17,9 +17,7 @@ namespace ktx { class ReaderException: public std::exception { public: ReaderException(const std::string& explanation) : _explanation("KTX deserialization error: " + explanation) {} - const char* what() const override { - return _explanation.c_str(); - } + const char* what() const noexcept override { return _explanation.c_str(); } private: const std::string _explanation; }; @@ -179,4 +177,4 @@ namespace ktx { return result; } -} \ No newline at end of file +} diff --git a/libraries/ktx/src/ktx/Writer.cpp b/libraries/ktx/src/ktx/Writer.cpp index edd9a9ec97..7cc6f9972d 100644 --- a/libraries/ktx/src/ktx/Writer.cpp +++ b/libraries/ktx/src/ktx/Writer.cpp @@ -16,9 +16,7 @@ namespace ktx { class WriterException : public std::exception { public: WriterException(const std::string& explanation) : _explanation("KTX serialization error: " + explanation) {} - const char* what() const override { - return _explanation.c_str(); - } + const char* what() const noexcept override { return _explanation.c_str(); } private: const std::string _explanation; };