From 748d7c0ce45ff90b42e644982e50f0f1d0074922 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Wed, 22 Feb 2017 15:06:01 -0500 Subject: [PATCH] macro NOEXCEPT for ktx on msvc --- libraries/ktx/src/ktx/Reader.cpp | 8 +++++++- libraries/ktx/src/ktx/Writer.cpp | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libraries/ktx/src/ktx/Reader.cpp b/libraries/ktx/src/ktx/Reader.cpp index 584bf219c4..e977f9ab4f 100644 --- a/libraries/ktx/src/ktx/Reader.cpp +++ b/libraries/ktx/src/ktx/Reader.cpp @@ -13,11 +13,17 @@ #include #include +#ifndef _MSC_VER +#define NOEXCEPT noexcept +#else +#define NOEXCEPT +#endif + namespace ktx { class ReaderException: public std::exception { public: ReaderException(const std::string& explanation) : _explanation("KTX deserialization error: " + explanation) {} - const char* what() const noexcept override { return _explanation.c_str(); } + const char* what() const NOEXCEPT override { return _explanation.c_str(); } private: const std::string _explanation; }; diff --git a/libraries/ktx/src/ktx/Writer.cpp b/libraries/ktx/src/ktx/Writer.cpp index 7cc6f9972d..1839624038 100644 --- a/libraries/ktx/src/ktx/Writer.cpp +++ b/libraries/ktx/src/ktx/Writer.cpp @@ -10,13 +10,18 @@ // #include "KTX.h" +#ifndef _MSC_VER +#define NOEXCEPT noexcept +#else +#define NOEXCEPT +#endif namespace ktx { class WriterException : public std::exception { public: WriterException(const std::string& explanation) : _explanation("KTX serialization error: " + explanation) {} - const char* what() const noexcept override { return _explanation.c_str(); } + const char* what() const NOEXCEPT override { return _explanation.c_str(); } private: const std::string _explanation; };