mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Get rid of warning: dynamic exception specifications are deprecated

Browse source
This commit is contained in:
fredzio 2020-10-10 12:08:27 +02:00
parent 0e8c5c5034
commit 460e69e92a
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
components/compiler/exception.hpp
View file

@ -10,8 +10,8 @@ namespace Compiler
class SourceException : public std::exception class SourceException : public std::exception
{ {
public: public:
virtual const char *what() const throw() { return "Compile error";} const char *what() const noexcept override { return "Compile error";}
///< Return error message ///< Return error message
}; };
@ -20,18 +20,18 @@ namespace Compiler
class FileException : public SourceException class FileException : public SourceException
{ {
public: public:
virtual const char *what() const throw() { return "Can't read file"; } const char *what() const noexcept final { return "Can't read file"; }
///< Return error message ///< Return error message
}; };
/// \brief Exception: EOF condition encountered /// \brief Exception: EOF condition encountered
class EOFException : public SourceException class EOFException : public SourceException
{ {
public: public:
virtual const char *what() const throw() { return "End of file"; } const char *what() const noexcept final { return "End of file"; }
///< Return error message ///< Return error message
}; };
} }

2
components/detournavigator/asyncnavmeshupdater.cpp
View file

@ -126,7 +126,7 @@ namespace DetourNavigator
mNavMeshTilesCache.reportStats(frameNumber, stats); mNavMeshTilesCache.reportStats(frameNumber, stats);
} }
void AsyncNavMeshUpdater::process() throw() void AsyncNavMeshUpdater::process() noexcept
{ {
Log(Debug::Debug) << "Start process navigator jobs by thread=" << std::this_thread::get_id(); Log(Debug::Debug) << "Start process navigator jobs by thread=" << std::this_thread::get_id();
while (!mShouldStop) while (!mShouldStop)

2
components/detournavigator/asyncnavmeshupdater.hpp
View file

@ -113,7 +113,7 @@ namespace DetourNavigator
std::map<std::thread::id, Queue> mThreadsQueues; std::map<std::thread::id, Queue> mThreadsQueues;
std::vector<std::thread> mThreads; std::vector<std::thread> mThreads;
void process() throw(); void process() noexcept;
bool processJob(const Job& job); bool processJob(const Job& job);

10
components/detournavigator/objectid.hpp
View file

@ -10,22 +10,22 @@ namespace DetourNavigator
{ {
public: public:
template <class T> template <class T>
explicit ObjectId(T* value) throw() explicit ObjectId(T* value) noexcept
: mValue(reinterpret_cast<std::size_t>(value)) : mValue(reinterpret_cast<std::size_t>(value))
{ {
} }
std::size_t value() const throw() std::size_t value() const noexcept
{ {
return mValue; return mValue;
} }
friend bool operator <(const ObjectId lhs, const ObjectId rhs) throw() friend bool operator <(const ObjectId lhs, const ObjectId rhs) noexcept
{ {
return lhs.mValue < rhs.mValue; return lhs.mValue < rhs.mValue;
} }
friend bool operator ==(const ObjectId lhs, const ObjectId rhs) throw() friend bool operator ==(const ObjectId lhs, const ObjectId rhs) noexcept
{ {
return lhs.mValue == rhs.mValue; return lhs.mValue == rhs.mValue;
} }
@ -40,7 +40,7 @@ namespace std
template <> template <>
struct hash<DetourNavigator::ObjectId> struct hash<DetourNavigator::ObjectId>
{ {
std::size_t operator ()(const DetourNavigator::ObjectId value) const throw() std::size_t operator ()(const DetourNavigator::ObjectId value) const noexcept
{ {
return value.value(); return value.value();
} }