From b1bc1a3b6cad465e80f5cfffdeb55f9e9747b3a3 Mon Sep 17 00:00:00 2001 From: Nuno Date: Wed, 29 Dec 2021 15:52:06 +0100 Subject: [PATCH] Fix issues with old gcc compiler (required by forge server) --- nel/include/nel/misc/common.h | 4 +-- nel/include/nel/misc/file.h | 2 +- nel/include/nel/misc/stream.h | 2 +- nel/include/nel/web/http_package_provider.h | 6 ++-- ryzom/common/src/game_share/object.h | 34 ++++++++++----------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/nel/include/nel/misc/common.h b/nel/include/nel/misc/common.h index 01817fa98..1e98ca3f7 100644 --- a/nel/include/nel/misc/common.h +++ b/nel/include/nel/misc/common.h @@ -412,8 +412,8 @@ public: Exception(); Exception(const std::string &reason); Exception(const char *format, ...); - virtual ~Exception() NL_OVERRIDE {} - virtual const char *what() const throw() NL_OVERRIDE; + virtual ~Exception() throw() {} + virtual const char *what() const throw(); }; diff --git a/nel/include/nel/misc/file.h b/nel/include/nel/misc/file.h index 2d3912842..0271be4a3 100644 --- a/nel/include/nel/misc/file.h +++ b/nel/include/nel/misc/file.h @@ -41,7 +41,7 @@ struct EFile : public EStream EFile (const std::string& filename) : EStream( "Unknown file error in '"+filename+"'" ), Filename(filename) {} EFile (const std::string& filename, const std::string& text, bool ) : EStream( text ), Filename(filename) {} - virtual ~EFile() NL_OVERRIDE {} + virtual ~EFile() throw() {} std::string Filename; }; diff --git a/nel/include/nel/misc/stream.h b/nel/include/nel/misc/stream.h index 9b18d575c..1dc56b1cd 100644 --- a/nel/include/nel/misc/stream.h +++ b/nel/include/nel/misc/stream.h @@ -81,7 +81,7 @@ struct EStream : public Exception EStream( const IStream &f, const std::string& str ); - virtual ~EStream() NL_OVERRIDE {} + virtual ~EStream() throw() {} // May Not be Filled... std::string StreamName; diff --git a/nel/include/nel/web/http_package_provider.h b/nel/include/nel/web/http_package_provider.h index 380b5cfa2..98b64a203 100644 --- a/nel/include/nel/web/http_package_provider.h +++ b/nel/include/nel/web/http_package_provider.h @@ -52,8 +52,8 @@ public: /// filePath: [out] ex. /games/nel/stream/00/00/000000000.. /// hash: [in] /// name: [in] name for debugging purposes - virtual bool getFile(std::string &filePath, const NLMISC::CHashKey &hash, const std::string &name) NL_OVERRIDE; - + virtual bool getFile(std::string &filePath, const NLMISC::CHashKey &hash, const std::string &name); + public: /// Set storage path (ex. stream/) std::string Path; @@ -61,7 +61,7 @@ public: /// Loads a package into the package manager (ex. http://cdn.ryzom.dev/open/stream/) typedef std::vector THosts; THosts Hosts; - + }; /* class CHttpPackageProvider */ } /* namespace NLMISC */ diff --git a/ryzom/common/src/game_share/object.h b/ryzom/common/src/game_share/object.h index 5b8c1c45d..5e8868256 100644 --- a/ryzom/common/src/game_share/object.h +++ b/ryzom/common/src/game_share/object.h @@ -291,40 +291,40 @@ public: explicit CObjectNumber(double value); explicit CObjectNumber(sint64 value); - virtual const char *getTypeAsString() const NL_OVERRIDE; + virtual const char *getTypeAsString() const; - virtual bool set(const std::string& key, sint64 value) NL_OVERRIDE; - virtual bool set(const std::string& key, double value) NL_OVERRIDE; - virtual bool set(const std::string& key, const std::string&value) NL_OVERRIDE; + virtual bool set(const std::string& key, sint64 value); + virtual bool set(const std::string& key, double value); + virtual bool set(const std::string& key, const std::string&value); - virtual bool setObject(const std::string& key, CObject* value) NL_OVERRIDE; + virtual bool setObject(const std::string& key, CObject* value); - virtual CObject* clone() const NL_OVERRIDE; + virtual CObject* clone() const; double getNumberValue() const { return m_IsInteger ? m_Value.Integer : m_Value.Number; } sint64 getIntegerValue() const { return m_IsInteger ? m_Value.Integer : m_Value.Number; } - virtual void dump(const std::string prefix = "", uint depth = 0) const NL_OVERRIDE; + virtual void dump(const std::string prefix = "", uint depth = 0) const; - virtual bool equal(const CObject* other) const NL_OVERRIDE; + virtual bool equal(const CObject* other) const; protected: - virtual void doSerialize(std::string& out, CSerializeContext& context) const NL_OVERRIDE; + virtual void doSerialize(std::string& out, CSerializeContext& context) const; - virtual bool doIsNumber() const NL_OVERRIDE; + virtual bool doIsNumber() const; - virtual double doToNumber() const NL_OVERRIDE; + virtual double doToNumber() const; - virtual bool doIsInteger() const NL_OVERRIDE; + virtual bool doIsInteger() const; - virtual sint64 doToInteger() const NL_OVERRIDE; + virtual sint64 doToInteger() const; - virtual std::string doToString() const NL_OVERRIDE; + virtual std::string doToString() const; - virtual void inPlaceCopyTo(CObject &dest) const NL_OVERRIDE; - virtual void inPlaceCopy(const CObjectNumber &src) NL_OVERRIDE; + virtual void inPlaceCopyTo(CObject &dest) const; + virtual void inPlaceCopy(const CObjectNumber &src); - virtual void visitInternal(IObjectVisitor &visitor) NL_OVERRIDE; + virtual void visitInternal(IObjectVisitor &visitor); private: bool m_IsInteger;