Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG-- branch : develop
This commit is contained in:
parent
443cc7df65
commit
facc5f6d28
8 changed files with 26 additions and 26 deletions
|
@ -210,7 +210,7 @@ public:
|
||||||
* \return the new offset regarding from the origin.
|
* \return the new offset regarding from the origin.
|
||||||
* \see ESeekNotSupported SeekOrigin seek
|
* \see ESeekNotSupported SeekOrigin seek
|
||||||
*/
|
*/
|
||||||
virtual sint32 getPos () const throw(EStream)
|
virtual sint32 getPos () const
|
||||||
{
|
{
|
||||||
return sint32(_Buffer.Pos);
|
return sint32(_Buffer.Pos);
|
||||||
}
|
}
|
||||||
|
|
|
@ -780,7 +780,7 @@ namespace NLNET
|
||||||
bool initModule(const TParsedCommandLine &initInfo);
|
bool initModule(const TParsedCommandLine &initInfo);
|
||||||
|
|
||||||
void plugModule(IModuleSocket *moduleSocket);
|
void plugModule(IModuleSocket *moduleSocket);
|
||||||
void unplugModule(IModuleSocket *moduleSocket) throw (EModuleNotPluggedHere);
|
void unplugModule(IModuleSocket *moduleSocket);
|
||||||
void getPluggedSocketList(std::vector<IModuleSocket*> &resultList);
|
void getPluggedSocketList(std::vector<IModuleSocket*> &resultList);
|
||||||
void invokeModuleOperation(IModuleProxy *destModule, const NLNET::CMessage &opMsg, NLNET::CMessage &resultMsg);
|
void invokeModuleOperation(IModuleProxy *destModule, const NLNET::CMessage &opMsg, NLNET::CMessage &resultMsg);
|
||||||
void _onModuleUp(IModuleProxy *removedProxy);
|
void _onModuleUp(IModuleProxy *removedProxy);
|
||||||
|
|
|
@ -849,7 +849,7 @@ public:
|
||||||
|
|
||||||
// Mode initialisation, requests
|
// Mode initialisation, requests
|
||||||
virtual bool init (uintptr_t windowIcon = 0, emptyProc exitFunc = 0);
|
virtual bool init (uintptr_t windowIcon = 0, emptyProc exitFunc = 0);
|
||||||
virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable
|
virtual bool setDisplay(nlWindow wnd, const GfxMode& mode, bool show, bool resizeable);
|
||||||
virtual bool release();
|
virtual bool release();
|
||||||
virtual bool setMode(const GfxMode& mode);
|
virtual bool setMode(const GfxMode& mode);
|
||||||
virtual bool getModes(std::vector<GfxMode> &modes);
|
virtual bool getModes(std::vector<GfxMode> &modes);
|
||||||
|
|
|
@ -49,7 +49,7 @@ void CClassRegistry::release()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ======================================================================================================
|
// ======================================================================================================
|
||||||
IClassable *CClassRegistry::create(const string &className) throw(ERegistry)
|
IClassable *CClassRegistry::create(const string &className)
|
||||||
{
|
{
|
||||||
init();
|
init();
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ IClassable *CClassRegistry::create(const string &className) throw(ERegistry)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ======================================================================================================
|
// ======================================================================================================
|
||||||
void CClassRegistry::registerClass(const string &className, IClassable* (*creator)(), const string &typeidCheck) throw(ERegistry)
|
void CClassRegistry::registerClass(const string &className, IClassable* (*creator)(), const string &typeidCheck)
|
||||||
{
|
{
|
||||||
init();
|
init();
|
||||||
|
|
||||||
|
|
|
@ -357,7 +357,7 @@ void CParticleWorkspace::setName(const std::string &name)
|
||||||
|
|
||||||
|
|
||||||
//***********************************************************************************************
|
//***********************************************************************************************
|
||||||
CParticleWorkspace::CNode *CParticleWorkspace::addNode(const std::string &filenameWithFullPath) throw( NLMISC::EStream)
|
CParticleWorkspace::CNode *CParticleWorkspace::addNode(const std::string &filenameWithFullPath)
|
||||||
{
|
{
|
||||||
nlassert(_OV);
|
nlassert(_OV);
|
||||||
// Check that file is not already inserted
|
// Check that file is not already inserted
|
||||||
|
|
|
@ -83,7 +83,7 @@ std::string CFightSelectFilter::toString() const
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
CFightScriptComp *CFightSelectFilterReader::create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *CFightSelectFilterReader::create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
std::vector<std::string> params;
|
std::vector<std::string> params;
|
||||||
explodeSubStrings(inStr, params, -1);
|
explodeSubStrings(inStr, params, -1);
|
||||||
|
@ -151,7 +151,7 @@ public:
|
||||||
CFightOnceReader() {}
|
CFightOnceReader() {}
|
||||||
virtual ~CFightOnceReader() {}
|
virtual ~CFightOnceReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> params;
|
vector<string> params;
|
||||||
explodeSubStrings(inStr, params, -1);
|
explodeSubStrings(inStr, params, -1);
|
||||||
|
@ -229,7 +229,7 @@ public:
|
||||||
CFightTimedFilterReader() {}
|
CFightTimedFilterReader() {}
|
||||||
virtual ~CFightTimedFilterReader() {}
|
virtual ~CFightTimedFilterReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> params;
|
vector<string> params;
|
||||||
explodeSubStrings(inStr, params, -1);
|
explodeSubStrings(inStr, params, -1);
|
||||||
|
@ -302,7 +302,7 @@ public:
|
||||||
CFightHPLessFilterReader() {}
|
CFightHPLessFilterReader() {}
|
||||||
virtual ~CFightHPLessFilterReader() {}
|
virtual ~CFightHPLessFilterReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> params;
|
vector<string> params;
|
||||||
explodeSubStrings(inStr, params, -1);
|
explodeSubStrings(inStr, params, -1);
|
||||||
|
@ -372,7 +372,7 @@ public:
|
||||||
CFightHPMoreFilterReader() {}
|
CFightHPMoreFilterReader() {}
|
||||||
virtual ~CFightHPMoreFilterReader() {}
|
virtual ~CFightHPMoreFilterReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> params;
|
vector<string> params;
|
||||||
explodeSubStrings(inStr, params, -1);
|
explodeSubStrings(inStr, params, -1);
|
||||||
|
@ -443,7 +443,7 @@ public:
|
||||||
CFightRandomFilterReader() {}
|
CFightRandomFilterReader() {}
|
||||||
virtual ~CFightRandomFilterReader() {}
|
virtual ~CFightRandomFilterReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> params;
|
vector<string> params;
|
||||||
explodeSubStrings(inStr, params, -1);
|
explodeSubStrings(inStr, params, -1);
|
||||||
|
@ -523,7 +523,7 @@ public:
|
||||||
CFightSendActionReader() {}
|
CFightSendActionReader() {}
|
||||||
virtual ~CFightSendActionReader() {}
|
virtual ~CFightSendActionReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> strings;
|
vector<string> strings;
|
||||||
explodeSubStrings(inStr, strings, -1);
|
explodeSubStrings(inStr, strings, -1);
|
||||||
|
@ -588,7 +588,7 @@ public:
|
||||||
CFightSendSelfActionReader() {}
|
CFightSendSelfActionReader() {}
|
||||||
virtual ~CFightSendSelfActionReader() {}
|
virtual ~CFightSendSelfActionReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> strings;
|
vector<string> strings;
|
||||||
explodeSubStrings(inStr, strings, -1);
|
explodeSubStrings(inStr, strings, -1);
|
||||||
|
@ -647,7 +647,7 @@ public:
|
||||||
CFightAggroBlockReader() {}
|
CFightAggroBlockReader() {}
|
||||||
virtual ~CFightAggroBlockReader() {}
|
virtual ~CFightAggroBlockReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> strings;
|
vector<string> strings;
|
||||||
explodeSubStrings(inStr, strings, -1);
|
explodeSubStrings(inStr, strings, -1);
|
||||||
|
@ -705,7 +705,7 @@ public:
|
||||||
CFightAggroChangeReader() {}
|
CFightAggroChangeReader() {}
|
||||||
virtual ~CFightAggroChangeReader() {}
|
virtual ~CFightAggroChangeReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
return new CFightAggroChange();
|
return new CFightAggroChange();
|
||||||
}
|
}
|
||||||
|
@ -751,7 +751,7 @@ public:
|
||||||
CFightDamageCoefReader() {}
|
CFightDamageCoefReader() {}
|
||||||
virtual ~CFightDamageCoefReader() {}
|
virtual ~CFightDamageCoefReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> strings;
|
vector<string> strings;
|
||||||
explodeSubStrings(inStr, strings, -1);
|
explodeSubStrings(inStr, strings, -1);
|
||||||
|
@ -818,7 +818,7 @@ public:
|
||||||
CFightGroupDamageCoefReader() {}
|
CFightGroupDamageCoefReader() {}
|
||||||
virtual ~CFightGroupDamageCoefReader() {}
|
virtual ~CFightGroupDamageCoefReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> strings;
|
vector<string> strings;
|
||||||
explodeSubStrings(inStr, strings, -1);
|
explodeSubStrings(inStr, strings, -1);
|
||||||
|
@ -871,7 +871,7 @@ public:
|
||||||
CFightDamageSpeedCoefReader() {}
|
CFightDamageSpeedCoefReader() {}
|
||||||
virtual ~CFightDamageSpeedCoefReader() {}
|
virtual ~CFightDamageSpeedCoefReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> strings;
|
vector<string> strings;
|
||||||
explodeSubStrings(inStr, strings, -1);
|
explodeSubStrings(inStr, strings, -1);
|
||||||
|
@ -933,7 +933,7 @@ public:
|
||||||
CFightSetRandomTargetReader() {}
|
CFightSetRandomTargetReader() {}
|
||||||
virtual ~CFightSetRandomTargetReader() {}
|
virtual ~CFightSetRandomTargetReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> strings;
|
vector<string> strings;
|
||||||
explodeSubStrings(inStr, strings, -1);
|
explodeSubStrings(inStr, strings, -1);
|
||||||
|
@ -1003,7 +1003,7 @@ public:
|
||||||
CFightMultReader() {}
|
CFightMultReader() {}
|
||||||
virtual ~CFightMultReader() {}
|
virtual ~CFightMultReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException)
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
{
|
{
|
||||||
vector<string> params;
|
vector<string> params;
|
||||||
explodeSubStrings(inStr, params, -1);
|
explodeSubStrings(inStr, params, -1);
|
||||||
|
@ -1075,7 +1075,7 @@ CFightScriptCompReader *CFightScriptCompReader::getScriptReader (const string &s
|
||||||
return &(*(it->second));
|
return &(*(it->second));
|
||||||
}
|
}
|
||||||
|
|
||||||
CFightScriptComp *CFightScriptCompReader::createScriptComp (const string &str) throw (ReadFightActionException)
|
CFightScriptComp *CFightScriptCompReader::createScriptComp (const string &str)
|
||||||
{
|
{
|
||||||
string scriptCompName;
|
string scriptCompName;
|
||||||
{
|
{
|
||||||
|
|
|
@ -51,12 +51,12 @@ public:
|
||||||
{}
|
{}
|
||||||
virtual ~CFightScriptCompReader()
|
virtual ~CFightScriptCompReader()
|
||||||
{}
|
{}
|
||||||
virtual CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException) = 0;
|
virtual CFightScriptComp *create (const std::string &inStr) = 0;
|
||||||
virtual std::string getName () const =0;
|
virtual std::string getName () const =0;
|
||||||
|
|
||||||
static CFightScriptCompReader *getScriptReader (const std::string &str);
|
static CFightScriptCompReader *getScriptReader (const std::string &str);
|
||||||
|
|
||||||
static CFightScriptComp *createScriptComp (const std::string &str) throw (ReadFightActionException);
|
static CFightScriptComp *createScriptComp (const std::string &str)
|
||||||
protected:
|
protected:
|
||||||
private:
|
private:
|
||||||
};
|
};
|
||||||
|
@ -116,7 +116,7 @@ public:
|
||||||
CFightSelectFilterReader() {}
|
CFightSelectFilterReader() {}
|
||||||
virtual ~CFightSelectFilterReader() {}
|
virtual ~CFightSelectFilterReader() {}
|
||||||
|
|
||||||
CFightScriptComp *create (const std::string &inStr) throw (ReadFightActionException);
|
CFightScriptComp *create (const std::string &inStr)
|
||||||
std::string getName () const
|
std::string getName () const
|
||||||
{
|
{
|
||||||
return std::string("SELECT");
|
return std::string("SELECT");
|
||||||
|
|
|
@ -101,7 +101,7 @@ public :
|
||||||
* Get the client infos
|
* Get the client infos
|
||||||
* \param id is the client character id
|
* \param id is the client character id
|
||||||
*/
|
*/
|
||||||
CChatClient& getClient( const TDataSetRow& id ); //throw (EChatClient);
|
CChatClient& getClient( const TDataSetRow& id );
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return a reference on the static database
|
* Return a reference on the static database
|
||||||
|
|
Loading…
Reference in a new issue