Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 23:57:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #9727 from zzmp/fix/ktx-noexcept

Browse source 
macro NOEXCEPT for ktx on msvc
This commit is contained in:
samcake 2017-02-22 13:07:08 -08:00 committed by GitHub
commit b40e4d4e85
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/ktx/src/ktx/Reader.cpp
View file

@ -13,11 +13,17 @@
#include <list> #include <list>
#include <QtGlobal> #include <QtGlobal>
#ifndef _MSC_VER
#define NOEXCEPT noexcept
#else
#define NOEXCEPT
#endif
namespace ktx { namespace ktx {
class ReaderException: public std::exception { class ReaderException: public std::exception {
public: public:
ReaderException(const std::string& explanation) : _explanation("KTX deserialization error: " + explanation) {} 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: private:
const std::string _explanation; const std::string _explanation;
}; };

7
libraries/ktx/src/ktx/Writer.cpp
View file

@ -10,13 +10,18 @@
// //
#include "KTX.h" #include "KTX.h"
#ifndef _MSC_VER
#define NOEXCEPT noexcept
#else
#define NOEXCEPT
#endif
namespace ktx { namespace ktx {
class WriterException : public std::exception { class WriterException : public std::exception {
public: public:
WriterException(const std::string& explanation) : _explanation("KTX serialization error: " + explanation) {} 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: private:
const std::string _explanation; const std::string _explanation;
}; };