From 48e05d005632c50d0fe73293a0933e8e52991f1a Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 7 Apr 2012 20:04:08 +0200 Subject: [PATCH] Changed: #825 Remove all warnings when compiling Ryzom --- code/nel/include/nel/3d/index_buffer.h | 2 +- code/nel/include/nel/3d/instance_lighter.h | 2 +- .../include/nel/3d/ps_attrib_maker_bin_op.h | 2 +- .../nel/3d/ps_attrib_maker_bin_op_inline.h | 4 +- .../nel/3d/ps_attrib_maker_iterators.h | 4 +- code/nel/include/nel/3d/ps_direction.h | 2 +- code/nel/include/nel/3d/ps_edit.h | 10 +-- code/nel/include/nel/3d/ps_force.h | 44 +++++------ code/nel/include/nel/3d/vertex_buffer.h | 2 +- .../include/nel/net/module_builder_parts.h | 4 +- code/nel/include/nel/net/transport_class.h | 2 +- .../common/src/game_share/data_set_base.h | 2 +- .../ryzom/common/src/game_share/inventories.h | 4 +- .../src/game_share/persistent_data_inline.h | 5 +- .../mission_manager/mission_event.h | 22 +++--- .../server/src/server_share/msg_ai_service.h | 74 +++++++++---------- .../src/server_share/pet_interface_msg.h | 10 +-- 17 files changed, 98 insertions(+), 97 deletions(-) diff --git a/code/nel/include/nel/3d/index_buffer.h b/code/nel/include/nel/3d/index_buffer.h index 320a06020..7beaafe0b 100644 --- a/code/nel/include/nel/3d/index_buffer.h +++ b/code/nel/include/nel/3d/index_buffer.h @@ -782,7 +782,7 @@ inline void CIndexBuffer::lock (CIndexBufferRead &accessor, uint first, uint las // *************************************************************************** -inline void CIndexBuffer::unlock (uint first, uint end) +inline void CIndexBuffer::unlock (uint /* first */, uint /* end */) { nlassertex (_LockCounter!=0, ("Index buffer not locked")); nlassert (_LockedBuffer || (!isResident() && _NonResidentIndexes.empty())); diff --git a/code/nel/include/nel/3d/instance_lighter.h b/code/nel/include/nel/3d/instance_lighter.h index 7b1dbb6e7..8b1ccf80a 100644 --- a/code/nel/include/nel/3d/instance_lighter.h +++ b/code/nel/include/nel/3d/instance_lighter.h @@ -147,7 +147,7 @@ public: static void addTriangles (const IShape &shape, const NLMISC::CMatrix& modelMT, std::vector& triangleArray, sint instanceId); // Progress callback - virtual void progress (const char *message, float progress) {} + virtual void progress (const char * /* message */, float /* progress */) {} /// \name Static PointLights mgt. diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h b/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h index 4370fdeaa..285fa9b26 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h +++ b/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h @@ -157,7 +157,7 @@ public: } /// return true if an operation is supported. The default support all ops - bool supportOp(CPSBinOp::BinOp op) { return true; } + bool supportOp(CPSBinOp::BinOp /* op */) { return true; } /// get the current operator CPSBinOp::BinOp getOp(void) const { return _Op; } diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h index c25c051a5..8d98a1544 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h +++ b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h @@ -57,13 +57,13 @@ inline CPlaneBasis PSBinOpModulate(CPlaneBasis p1, CPlaneBasis p2) } template <> -inline CPlaneBasis PSBinOpAdd(CPlaneBasis p1, CPlaneBasis p2) +inline CPlaneBasis PSBinOpAdd(CPlaneBasis /* p1 */, CPlaneBasis /* p2 */) { nlassert(0); // not allowed for now return CPlaneBasis(NLMISC::CVector::Null); } template <> -inline CPlaneBasis PSBinOpSubtract(CPlaneBasis p1, CPlaneBasis p2) +inline CPlaneBasis PSBinOpSubtract(CPlaneBasis /* p1 */, CPlaneBasis /* p2 */) { nlassert(0); // not allowed for now return CPlaneBasis(NLMISC::CVector::Null); diff --git a/code/nel/include/nel/3d/ps_attrib_maker_iterators.h b/code/nel/include/nel/3d/ps_attrib_maker_iterators.h index 8729ffb10..d9cfbcdd3 100644 --- a/code/nel/include/nel/3d/ps_attrib_maker_iterators.h +++ b/code/nel/include/nel/3d/ps_attrib_maker_iterators.h @@ -60,7 +60,7 @@ namespace NL3D { GET_INLINE float get() const { return float(rand() * (1 / double(RAND_MAX))); } // this may be optimized with a table... void advance() {} - void advance(uint quantity) {} + void advance(uint /* quantity */) {} }; /// this iterator just return the same value @@ -69,7 +69,7 @@ namespace NL3D float Value; GET_INLINE float get() const { return Value; } void advance() {} - void advance(uint quantity) {} + void advance(uint /* quantity */) {} }; /// iterator that use dist to compute the value diff --git a/code/nel/include/nel/3d/ps_direction.h b/code/nel/include/nel/3d/ps_direction.h index 609278a80..eb8bbd827 100644 --- a/code/nel/include/nel/3d/ps_direction.h +++ b/code/nel/include/nel/3d/ps_direction.h @@ -38,7 +38,7 @@ public : /** The direction is taken from a global vector defined in the particle system * NULL or an empty string as a name disable the use of a global value */ - virtual void enableGlobalVectorValue(const std::string &name) {} + virtual void enableGlobalVectorValue(const std::string &/* name */) {} virtual std::string getGlobalVectorValueName() const { return ""; } }; diff --git a/code/nel/include/nel/3d/ps_edit.h b/code/nel/include/nel/3d/ps_edit.h index d3e1a53de..8342868f8 100644 --- a/code/nel/include/nel/3d/ps_edit.h +++ b/code/nel/include/nel/3d/ps_edit.h @@ -65,13 +65,13 @@ struct IPSMover virtual bool supportNonUniformScaling(void) const { NL_PS_FUNC(supportNonUniformScaling); return false ; } // set the scale of the object (uniform scale). The default does nothing - virtual void setScale(uint32 index, float scale) {} ; + virtual void setScale(uint32 /* index */, float /* scale */) {} // set a non uniform scale (if supported) - virtual void setScale(uint32 index, const NLMISC::CVector &s) { NL_PS_FUNC(setScale); } + virtual void setScale(uint32 /* index */, const NLMISC::CVector &/* s */) { NL_PS_FUNC(setScale); } // get the scale of the object - virtual NLMISC::CVector getScale(uint32 index) const { NL_PS_FUNC(getScale); return NLMISC::CVector(1.f, 1.f, 1.f) ; } + virtual NLMISC::CVector getScale(uint32 /* index */) const { NL_PS_FUNC(getScale); return NLMISC::CVector(1.f, 1.f, 1.f) ; } /** some object may not store a whole matrix (e.g planes) * this return true if only a normal is needed to set the orientation of the object @@ -79,10 +79,10 @@ struct IPSMover virtual bool onlyStoreNormal(void) const { NL_PS_FUNC(onlyStoreNormal); return false ; } /// if the object only needs a normal, this return the normal. If not, is return (0, 0, 0) - virtual NLMISC::CVector getNormal(uint32 index) { NL_PS_FUNC(getNormal); return NLMISC::CVector::Null ; } + virtual NLMISC::CVector getNormal(uint32 /* index */) { NL_PS_FUNC(getNormal); return NLMISC::CVector::Null ; } /// if the object only stores a normal, this set the normal of the object. Otherwise it has no effect - virtual void setNormal(uint32 index, NLMISC::CVector n) { NL_PS_FUNC(setNormal); } + virtual void setNormal(uint32 /* index */, NLMISC::CVector /* n */) { NL_PS_FUNC(setNormal); } // set a new orthogonal matrix for the object virtual void setMatrix(uint32 index, const NLMISC::CMatrix &m) = 0 ; diff --git a/code/nel/include/nel/3d/ps_force.h b/code/nel/include/nel/3d/ps_force.h index 5e961dc43..15e28948a 100644 --- a/code/nel/include/nel/3d/ps_force.h +++ b/code/nel/include/nel/3d/ps_force.h @@ -87,9 +87,9 @@ public: * 'accumulate' set to false. * NB : works only with integrable forces */ - virtual void integrate(float date, CPSLocated *src, uint32 startIndex, uint32 numObjects, NLMISC::CVector *destPos = NULL, NLMISC::CVector *destSpeed = NULL, - bool accumulate = false, - uint posStride = sizeof(NLMISC::CVector), uint speedStride = sizeof(NLMISC::CVector) + virtual void integrate(float /* date */, CPSLocated * /* src */, uint32 /* startIndex */, uint32 /* numObjects */, NLMISC::CVector * /* destPos */ = NULL, NLMISC::CVector * /* destSpeed */ = NULL, + bool /* accumulate */ = false, + uint /* posStride */ = sizeof(NLMISC::CVector), uint /* speedStride */ = sizeof(NLMISC::CVector) ) const { nlassert(0); // not an integrable force @@ -100,11 +100,11 @@ public: * If the start date is lower than the creation date, the initial position is used * NB : works only with integrable forces */ - virtual void integrateSingle(float startDate, float deltaT, uint numStep, - const CPSLocated *src, uint32 indexInLocated, - NLMISC::CVector *destPos, - bool accumulate = false, - uint posStride = sizeof(NLMISC::CVector)) const + virtual void integrateSingle(float /* startDate */, float /* deltaT */, uint /* numStep */, + const CPSLocated * /* src */, uint32 /* indexInLocated */, + NLMISC::CVector * /* destPos */, + bool /* accumulate */ = false, + uint /* posStride */ = sizeof(NLMISC::CVector)) const { nlassert(0); // not an integrable force } @@ -170,7 +170,7 @@ public: virtual void setIntensityScheme(CPSAttribMaker *scheme); // deriver have here the opportunity to setup the functor object. The default does nothing - virtual void setupFunctor(uint32 indexInLocated) { } + virtual void setupFunctor(uint32 /* indexInLocated */) { } /// get the attribute maker for a non constant intensity CPSAttribMaker *getIntensityScheme(void) { return _IntensityScheme; } @@ -493,22 +493,22 @@ public: #ifdef NL_OS_WINDOWS __forceinline #endif - void operator() (const NLMISC::CVector &pos, NLMISC::CVector &speed, float invMass) - { + void operator() (const NLMISC::CVector &/* pos */, NLMISC::CVector &speed, float invMass) + { speed -= (CParticleSystem::EllapsedTime * _K * invMass * speed); - } + } - virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) - { - f.serialVersion(1); - // we don't save intensity info : it is saved by the owning object (and set before each use of this functor) - } + virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream) + { + f.serialVersion(1); + // we don't save intensity info : it is saved by the owning object (and set before each use of this functor) + } - // get the friction coefficient - float getK(void) const { return _K; } + // get the friction coefficient + float getK(void) const { return _K; } - // set the friction coefficient - void setK(float coeff) { _K = coeff; } + // set the friction coefficient + void setK(float coeff) { _K = coeff; } protected: // the friction coeff float _K; @@ -630,7 +630,7 @@ struct CPSTurbulForceFunc #ifdef NL_OS_WINDOWS __forceinline #endif - void operator() (const NLMISC::CVector &pos, NLMISC::CVector &speed, float invMass) + void operator() (const NLMISC::CVector &/* pos */, NLMISC::CVector &/* speed */, float /* invMass */) { nlassert(0); diff --git a/code/nel/include/nel/3d/vertex_buffer.h b/code/nel/include/nel/3d/vertex_buffer.h index 83b2b90ea..a64ec0c2c 100644 --- a/code/nel/include/nel/3d/vertex_buffer.h +++ b/code/nel/include/nel/3d/vertex_buffer.h @@ -1223,7 +1223,7 @@ inline void CVertexBuffer::lock (CVertexBufferRead &accessor, uint first, uint l // -------------------------------------------------- -inline void CVertexBuffer::unlock (uint first, uint end) +inline void CVertexBuffer::unlock (uint /* first */, uint /* end */) { nlassertex (_LockCounter!=0, ("Vertex buffer not locked")); nlassert (_LockedBuffer || (!isResident() && _NonResidentVertices.empty())); diff --git a/code/nel/include/nel/net/module_builder_parts.h b/code/nel/include/nel/net/module_builder_parts.h index b080e521f..d2e653315 100644 --- a/code/nel/include/nel/net/module_builder_parts.h +++ b/code/nel/include/nel/net/module_builder_parts.h @@ -188,8 +188,8 @@ namespace NLNET // unused interceptors std::string fwdBuildModuleManifest() const { return std::string(); } - void fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {} - bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message) {return false;} + void fwdOnModuleSecurityChange(NLNET::IModuleProxy * /* moduleProxy */) {} + bool fwdOnProcessModuleMessage(NLNET::IModuleProxy * /* sender */, const NLNET::CMessage &/* message */) {return false;} // check module up void fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy) diff --git a/code/nel/include/nel/net/transport_class.h b/code/nel/include/nel/net/transport_class.h index 2517da64b..f1110e492 100644 --- a/code/nel/include/nel/net/transport_class.h +++ b/code/nel/include/nel/net/transport_class.h @@ -335,7 +335,7 @@ protected: T *Value; - virtual void serialDefaultValue (NLMISC::IStream &f) + virtual void serialDefaultValue (NLMISC::IStream &/* f */) { // nothing } diff --git a/code/ryzom/common/src/game_share/data_set_base.h b/code/ryzom/common/src/game_share/data_set_base.h index 0db688aa5..54bd790ab 100644 --- a/code/ryzom/common/src/game_share/data_set_base.h +++ b/code/ryzom/common/src/game_share/data_set_base.h @@ -437,7 +437,7 @@ public: // PUBLIC because template friend classes are not supported /// Return the pointer to the property value template - void getPropPointerForList( TSharedListRow **ppt, TPropertyIndex propIndex, const TDataSetRow& entityIndex, T* typeHint ) const + void getPropPointerForList( TSharedListRow **ppt, TPropertyIndex propIndex, const TDataSetRow& entityIndex, T* /* typeHint */ ) const { #ifndef FAST_MIRROR nlassert( (propIndex != INVALID_PROPERTY_INDEX) && (propIndex < (TPropertyIndex)_PropertyContainer.PropertyValueArrays.size()) ); // Wrong property diff --git a/code/ryzom/common/src/game_share/inventories.h b/code/ryzom/common/src/game_share/inventories.h index 1fd1cab48..2dfbb85bf 100644 --- a/code/ryzom/common/src/game_share/inventories.h +++ b/code/ryzom/common/src/game_share/inventories.h @@ -349,7 +349,7 @@ namespace INVENTORIES /// Serial from/to bit stream template - void serialAll( NLMISC::CBitMemStream& bms, const CInventoryCategoryTemplate *templ=0 ) + void serialAll( NLMISC::CBitMemStream& bms, const CInventoryCategoryTemplate * /* templ */ =0 ) { bms.serial( _SlotIndex, CInventoryCategoryTemplate::SlotBitSize ); @@ -385,7 +385,7 @@ namespace INVENTORIES /// Serial from/to bit stream template - void serialOneProp( NLMISC::CBitMemStream& bms, const CInventoryCategoryTemplate *templ=0 ) + void serialOneProp( NLMISC::CBitMemStream& bms, const CInventoryCategoryTemplate * /* templ */ =0 ) { bms.serial( _SlotIndex, CInventoryCategoryTemplate::SlotBitSize ); bms.serial( _OneProp ); diff --git a/code/ryzom/common/src/game_share/persistent_data_inline.h b/code/ryzom/common/src/game_share/persistent_data_inline.h index 2500c524d..9a682afdb 100644 --- a/code/ryzom/common/src/game_share/persistent_data_inline.h +++ b/code/ryzom/common/src/game_share/persistent_data_inline.h @@ -420,7 +420,9 @@ inline const CPersistentDataRecord::CArg& CPersistentDataRecord::popNextArg(TTok inline void CPersistentDataRecord::popNextArg(TToken token,CPersistentDataRecord::CArg& result) { #ifdef NL_DEBUG - BOMB_IF(peekNextToken()!=token,"Error on read code - token requested doesn't match token found",return); + BOMB_IF(peekNextToken()!=token,"Error on read code - token requested doesn't match token found",return); + #else + nlunreferenced(token); #endif peekNextArg(result); @@ -445,7 +447,6 @@ inline void CPersistentDataRecord::popNextArg(TToken token,CPersistentDataRecord ++_ArgOffset; ++_TokenOffset; } - return; } //inline CPersistentDataRecord::CArg CPersistentDataRecord::popNextArg(TToken token) diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h b/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h index 34ff36600..a0f9e77d7 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h +++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h @@ -390,7 +390,7 @@ public: :CMissionEvent(EndDynChat,TDataSetRow()){} protected: friend class CMissionEvent; - bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;}; + bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;} }; class CMissionEventDebug : public CMissionEvent @@ -400,7 +400,7 @@ public: :CMissionEvent(Debug,TDataSetRow()){} protected: friend class CMissionEvent; - bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;}; + bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;} }; @@ -412,7 +412,7 @@ public: uint32 Points; protected: friend class CMissionEvent; - bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;}; + bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;} }; class CMissionEventOutpostGain : public CMissionEvent @@ -422,7 +422,7 @@ public: :CMissionEvent(OutpostGain,TDataSetRow()){} protected: friend class CMissionEvent; - bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;}; + bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;} }; @@ -437,7 +437,7 @@ public: bool Guild; protected: friend class CMissionEvent; - bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;} + bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;} }; class CMissionEventQueueEntryOk: public CMissionEvent @@ -447,7 +447,7 @@ public: :CMissionEvent(QueueEntryOk, TDataSetRow()) {} protected: friend class CMissionEvent; - bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log) { return false; } + bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;} }; @@ -458,7 +458,7 @@ public: :CMissionEvent(QueueExit, TDataSetRow()) {} protected: friend class CMissionEvent; - bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log) { return false; } + bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;} }; class CMissionEventGroupSpawned : public CMissionEvent @@ -470,8 +470,8 @@ public: TAIAlias Alias; protected: friend class CMissionEvent; - CMissionEventGroupSpawned(){}; - bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log) { return false; } + CMissionEventGroupSpawned(){} + bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;} }; class CMissionEventGroupDespawned : public CMissionEvent @@ -483,8 +483,8 @@ public: TAIAlias Alias; protected: friend class CMissionEvent; - CMissionEventGroupDespawned(){}; - bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log) { return false; } + CMissionEventGroupDespawned(){} + bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;} }; #endif // RY_MISSION_EVENT_H diff --git a/code/ryzom/server/src/server_share/msg_ai_service.h b/code/ryzom/server/src/server_share/msg_ai_service.h index c62ca0283..a442b5234 100644 --- a/code/ryzom/server/src/server_share/msg_ai_service.h +++ b/code/ryzom/server/src/server_share/msg_ai_service.h @@ -49,7 +49,7 @@ public: propertyCont ("Character", PropDataSetRow, Character); propertyCont ("Creature", PropDataSetRow, Creature); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}; }; //---------------------------------------------------------------------------- @@ -68,7 +68,7 @@ public: propertyCont ("Content", PropString, Content); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -94,7 +94,7 @@ public: propertyCont ("Params", PropString, Params); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -115,7 +115,7 @@ public: propertyCont ("GrpAlias", PropUInt32, GrpAlias); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -138,7 +138,7 @@ public: property ("TeamId", PropUInt16, CTEAM::InvalidTeamId, TeamId); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -160,7 +160,7 @@ public: // propertyCont ("OutpostNames", PropString, OutpostNames); // } // -// virtual void callback (const std::string &name, NLNET::TServiceId id) {}; +// virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} //}; //---------------------------------------------------------------------------- @@ -198,7 +198,7 @@ public: //// propertyCont ("Fames", PropString, DutyNames); // } // -// virtual void callback (const std::string &name, NLNET::TServiceId id) {}; +// virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} //}; //---------------------------------------------------------------------------- @@ -227,7 +227,7 @@ public: propertyCont ("Parameters", PropString, Parameters); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -253,7 +253,7 @@ public: // property ("GuildIndex", PropDataSetRow, TDataSetRow() ,GuildIndex); // } // -// virtual void callback (const std::string &name, NLNET::TServiceId id) {}; +// virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} //}; @@ -280,7 +280,7 @@ public: // property ("GuildId", PropDataSetRow, TDataSetRow() ,GuildId); // } // -// virtual void callback (const std::string &name, NLNET::TServiceId id) {}; +// virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} //}; //---------------------------------------------------------------------------- @@ -299,7 +299,7 @@ public: property ("BotRowId", PropDataSetRow, TDataSetRow() , BotRowId); property ("Heading", PropFloat,0.0f,Heading); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -317,7 +317,7 @@ public: property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId); property ("TargetRowId", PropDataSetRow, TDataSetRow(), TargetRowId); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -336,7 +336,7 @@ public: property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId); property ("CreatureRowId", PropDataSetRow, TDataSetRow(), CreatureRowId); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -365,7 +365,7 @@ public: property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId); property ("TargetRowId", PropDataSetRow, TDataSetRow(), TargetRowId); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -394,7 +394,7 @@ public: property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId); property ("TargetRowId", PropDataSetRow, TDataSetRow(), TargetRowId); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -410,7 +410,7 @@ public: className ("CAIPlayerRespawnMsg"); property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -428,7 +428,7 @@ public: property ("EntityRowId", PropDataSetRow, TDataSetRow(), EntityRowId); property ("AskerRowID", PropDataSetRow, TDataSetRow(), AskerRowID); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -448,7 +448,7 @@ public: property ("AskerRowID", PropDataSetRow, TDataSetRow(), AskerRowID); propertyCont ("Infos", PropString, Infos); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -466,7 +466,7 @@ public: property ("EntityRowId", PropDataSetRow, TDataSetRow(), EntityRowId); property ("EnableAggro", PropBool, true, EnableAggro); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -482,7 +482,7 @@ public: className ("CReportAICollisionAvailableMsg"); propertyCont ("ContinentsCollision", PropString, ContinentsCollision); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -500,7 +500,7 @@ public: property ("InstanceNumber", PropUInt32, uint32(0), InstanceNumber); property ("InstanceContinent", PropString, std::string(), InstanceContinent); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -520,7 +520,7 @@ public: property ("ActionName", PropString, std::string(), ActionName); property ("Url", PropString, std::string(), Url); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -536,7 +536,7 @@ public: className ("CReportAIInstanceDespawnMsg"); propertyCont ("InstanceNumbers", PropUInt32, InstanceNumbers); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; @@ -555,7 +555,7 @@ public: className ("CWarnBadInstanceMsg"); property ("InstanceNumber", PropUInt32, uint32(0), InstanceNumber); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -575,7 +575,7 @@ public: propertyCont ("ActionFlags", PropUInt8, ActionFlags); propertyVector ("Values", PropBool, Values); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} inline void push(TDataSetRow entity, uint8 flag, bool value) { @@ -599,7 +599,7 @@ public: propertyCont ("Entities", PropDataSetRow, Entities); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -620,7 +620,7 @@ public: propertyCont ("SetFull", PropUInt8, SetFull); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -639,7 +639,7 @@ public: propertyCont ("DeltaHp", PropSInt32, DeltaHp); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -657,7 +657,7 @@ public: property ("CreatureId", PropDataSetRow, TDataSetRow(), CreatureId); property ("NewMode", PropUInt8, (uint8)0, NewMode); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -673,7 +673,7 @@ public: className ("CCreatureDespawnMsg"); propertyCont ("Entities", PropDataSetRow, Entities); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; ///////////////////////////////////////////////////////////////////////////// @@ -934,7 +934,7 @@ public: property ("MissionAlias", PropUInt32, uint32(0xffffffff), MissionAlias); property ("DespawnTimeInTick", PropUInt32, uint32(0), DespawnTimeInTick); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -954,7 +954,7 @@ public: property ("GroupAlias", PropUInt32, uint32(0xffffffff), GroupAlias); property ("MissionAlias", PropUInt32, uint32(0xffffffff), MissionAlias); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -974,7 +974,7 @@ public: property ("GroupAlias", PropUInt32, uint32(0xffffffff), GroupAlias); property ("MissionAlias", PropUInt32, uint32(0xffffffff), MissionAlias); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -994,7 +994,7 @@ public: property ("GroupAlias", PropUInt32, uint32(0xffffffff), GroupAlias); property ("MissionAlias", PropUInt32, uint32(0xffffffff), MissionAlias); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; @@ -1046,7 +1046,7 @@ public: propertyCont ("Quantities", PropUInt32, Quantities); property ("MissionText", PropString, std::string(), MissionText); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------------------- @@ -1082,7 +1082,7 @@ public: propertyCont ("Quantities", PropUInt32, Quantities); property ("MissionText", PropString, std::string(), MissionText); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {} + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; @@ -1130,7 +1130,7 @@ public: propertyCont ("Params", PropString, Params); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} TFunEnum getFunEnum(const std::string& funName) const; diff --git a/code/ryzom/server/src/server_share/pet_interface_msg.h b/code/ryzom/server/src/server_share/pet_interface_msg.h index 09bbab13d..6571b271a 100644 --- a/code/ryzom/server/src/server_share/pet_interface_msg.h +++ b/code/ryzom/server/src/server_share/pet_interface_msg.h @@ -59,7 +59,7 @@ public: property ("CustomName", PropUCString, ucstring(""), CustomName); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; @@ -93,7 +93,7 @@ public: property ("PetMirrorRow", PropDataSetRow, TDataSetRow(), PetMirrorRow); property ("PetIndex", PropUInt16, (uint16)0, PetIdx); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; @@ -123,7 +123,7 @@ public: property ("Heading", PropFloat, 0.0f, Heading); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------- @@ -151,7 +151,7 @@ public: className ("CPetCommandConfirmationMsg"); property ("CommandError", PropUInt16, (uint16)NO_ERROR_COMMAND, CommandError); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; //---------------------------------------------------------------- @@ -171,7 +171,7 @@ public: property ("PetMirrorRow", PropDataSetRow, TDataSetRow(), PetMirrorRow); } - virtual void callback (const std::string &name, NLNET::TServiceId id) {}; + virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} }; #endif //RY_PET_INTERFACE_MESSAGES_H