diff --git a/nel/include/nel/web/http_package_provider.h b/nel/include/nel/web/http_package_provider.h index 380b5cfa2..d431b3add 100644 --- a/nel/include/nel/web/http_package_provider.h +++ b/nel/include/nel/web/http_package_provider.h @@ -52,8 +52,12 @@ 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; - + #if defined(NL_COMP_GCC) && (GCC_VERSION < 40800) + virtual bool getFile(std::string &filePath, const NLMISC::CHashKey &hash, const std::string &name); + #else + virtual bool getFile(std::string &filePath, const NLMISC::CHashKey &hash, const std::string &name) NL_OVERRIDE; + #endif + public: /// Set storage path (ex. stream/) std::string Path; @@ -61,7 +65,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 d5f54b40e..2b3be9b21 100644 --- a/ryzom/common/src/game_share/object.h +++ b/ryzom/common/src/game_share/object.h @@ -296,13 +296,13 @@ public: #if defined(NL_COMP_GCC) && (GCC_VERSION < 40800) 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; virtual void dump(const std::string prefix = "", uint depth = 0) const; @@ -327,18 +327,18 @@ protected: #if defined(NL_COMP_GCC) && (GCC_VERSION < 40800) 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); #else