From cecfbb9df9dcc14722c5258c710a5306991c0307 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 2 Feb 2018 21:13:07 +0100 Subject: [PATCH] Fixed: Warnings, throw(NLMISC::EStream) deprecated in C++11 and removed in C++17, and class keyword is useless --HG-- branch : develop --- code/nel/include/nel/3d/key.h | 10 +++++----- code/nel/include/nel/3d/track.h | 4 ++-- code/nel/include/nel/3d/track_keyframer.h | 2 +- code/nel/include/nel/misc/entity_id.h | 4 ++-- code/nel/src/3d/packed_zone.cpp | 4 ++-- code/ryzom/common/src/game_share/character_summary.h | 2 +- code/ryzom/common/src/game_share/mode_and_behaviour.h | 4 ++-- .../common/src/game_share/player_visual_properties.h | 10 +++++----- code/ryzom/common/src/game_share/properties.h | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/code/nel/include/nel/3d/key.h b/code/nel/include/nel/3d/key.h index d30bfcd6e..6982dc98b 100644 --- a/code/nel/include/nel/3d/key.h +++ b/code/nel/include/nel/3d/key.h @@ -47,7 +47,7 @@ public: public: /// Serial - void serial (NLMISC::IStream& f) throw (NLMISC::EStream) + void serial (NLMISC::IStream& f) { // Version number (void)f.serialVersion (0); @@ -83,7 +83,7 @@ class CKeyTCB : public CKey public: /// Serial - void serial (NLMISC::IStream& f) throw (NLMISC::EStream) + void serial (NLMISC::IStream& f) { // Version number (void)f.serialVersion (0); @@ -130,7 +130,7 @@ class CKeyBezier : public CKey public: /// Serial - void serial (NLMISC::IStream& f) throw (NLMISC::EStream) + void serial (NLMISC::IStream& f) { // Version number (void)f.serialVersion (0); @@ -180,7 +180,7 @@ template<> class CKeyTCB : public CKey public: /// Serial - void serial (NLMISC::IStream& f) throw (NLMISC::EStream) + void serial (NLMISC::IStream& f) { // Version number (void)f.serialVersion (0); @@ -228,7 +228,7 @@ template<> class CKeyBezier : public CKey public: /// Serial - void serial (NLMISC::IStream& f) throw (NLMISC::EStream) + void serial (NLMISC::IStream& f) { // Version number (void)f.serialVersion (0); diff --git a/code/nel/include/nel/3d/track.h b/code/nel/include/nel/3d/track.h index e3c88f800..1ef8a4f1e 100644 --- a/code/nel/include/nel/3d/track.h +++ b/code/nel/include/nel/3d/track.h @@ -166,7 +166,7 @@ public: /// Serial the template - virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream) + virtual void serial (NLMISC::IStream& f) { // Serial version (void)f.serialVersion (0); @@ -217,7 +217,7 @@ public: /// Serial the template - virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream) + virtual void serial (NLMISC::IStream& f) { // Serial version (void)f.serialVersion (0); diff --git a/code/nel/include/nel/3d/track_keyframer.h b/code/nel/include/nel/3d/track_keyframer.h index 6cfb6736a..c49e63404 100644 --- a/code/nel/include/nel/3d/track_keyframer.h +++ b/code/nel/include/nel/3d/track_keyframer.h @@ -237,7 +237,7 @@ public: /// Serial the template - virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream) + virtual void serial (NLMISC::IStream& f) { // Serial version (void)f.serialVersion (0); diff --git a/code/nel/include/nel/misc/entity_id.h b/code/nel/include/nel/misc/entity_id.h index 46561a512..8999b170a 100644 --- a/code/nel/include/nel/misc/entity_id.h +++ b/code/nel/include/nel/misc/entity_id.h @@ -450,8 +450,8 @@ public: } - void serial (NLMISC::IStream &f) throw (NLMISC::EStream) -// virtual void serial (NLMISC::IStream &f) throw (NLMISC::EStream) + void serial (NLMISC::IStream &f) +// virtual void serial (NLMISC::IStream &f) { if (f.isReading ()) { diff --git a/code/nel/src/3d/packed_zone.cpp b/code/nel/src/3d/packed_zone.cpp index dbc9b2d1d..aa3eff11f 100644 --- a/code/nel/src/3d/packed_zone.cpp +++ b/code/nel/src/3d/packed_zone.cpp @@ -590,7 +590,7 @@ CPackedZone32::CPackedZone32() } // *************************************************************************************** -void CPackedZone32::serial(NLMISC::IStream &f) throw (NLMISC::EStream) +void CPackedZone32::serial(NLMISC::IStream &f) { f.serialVersion(0); f.serial(Box); @@ -1086,7 +1086,7 @@ CSmartPtr CPackedZone32::buildPackedZone16() } // *************************************************************************************** -void CPackedZone16::serial(NLMISC::IStream &f) throw (NLMISC::EStream) +void CPackedZone16::serial(NLMISC::IStream &f) { f.serialVersion(0); f.serial(Box); diff --git a/code/ryzom/common/src/game_share/character_summary.h b/code/ryzom/common/src/game_share/character_summary.h index ff16ef728..34b0f2a86 100644 --- a/code/ryzom/common/src/game_share/character_summary.h +++ b/code/ryzom/common/src/game_share/character_summary.h @@ -77,7 +77,7 @@ struct CCharacterSummary bool InNewbieland; /// serialisation coming from a stream (net message) - void serial(NLMISC::IStream &f) throw (NLMISC::EStream); + void serial(NLMISC::IStream &f); }; #endif diff --git a/code/ryzom/common/src/game_share/mode_and_behaviour.h b/code/ryzom/common/src/game_share/mode_and_behaviour.h index b56a20354..7cf9faee5 100644 --- a/code/ryzom/common/src/game_share/mode_and_behaviour.h +++ b/code/ryzom/common/src/game_share/mode_and_behaviour.h @@ -174,7 +174,7 @@ namespace MBEHAV return modeToString( (EMode)Mode ); // TODO: param } - inline void serial (NLMISC::IStream &f) throw (NLMISC::EStream) + inline void serial (NLMISC::IStream &f) { f.serial( RawModeAndParam ); } @@ -522,7 +522,7 @@ namespace MBEHAV inline bool operator != ( const CBehaviour& p ) const { return (Behaviour != (EBehaviour)p.Behaviour || Data != p.Data || Data2 != p.Data2 || DeltaHP != p.DeltaHP); } - inline void serial (NLMISC::IStream &f) throw (NLMISC::EStream) + inline void serial (NLMISC::IStream &f) { if (f.isReading() ) { diff --git a/code/ryzom/common/src/game_share/player_visual_properties.h b/code/ryzom/common/src/game_share/player_visual_properties.h index 926bc15f0..a10f420a0 100644 --- a/code/ryzom/common/src/game_share/player_visual_properties.h +++ b/code/ryzom/common/src/game_share/player_visual_properties.h @@ -82,7 +82,7 @@ struct SPropVisualA bool operator != ( const SPropVisualA& p ) const { return PropertyA != p.PropertyA; } - void serial (NLMISC::IStream &f) throw (NLMISC::EStream) + void serial (NLMISC::IStream &f) { f.serial( PropertyA ); } @@ -132,7 +132,7 @@ struct SPropVisualB bool operator != ( const SPropVisualB& p ) const { return PropertyB != p.PropertyB; } - void serial (NLMISC::IStream &f) throw (NLMISC::EStream) + void serial (NLMISC::IStream &f) { f.serial( PropertyB ); } @@ -200,7 +200,7 @@ struct SPropVisualC bool operator != ( const SPropVisualC& p ) const { return PropertyC != p.PropertyC; } - void serial (NLMISC::IStream &f) throw (NLMISC::EStream) + void serial (NLMISC::IStream &f) { f.serial( PropertyC ); } @@ -286,7 +286,7 @@ struct SAltLookProp //@} // Serial - void serial (NLMISC::IStream &f) throw (NLMISC::EStream) + void serial (NLMISC::IStream &f) { f.serial( Summary ); } @@ -321,7 +321,7 @@ struct SAltLookProp2 //@} // Serial - void serial (NLMISC::IStream &f) throw (NLMISC::EStream) + void serial (NLMISC::IStream &f) { f.serial( Summary ); } diff --git a/code/ryzom/common/src/game_share/properties.h b/code/ryzom/common/src/game_share/properties.h index 02d98bbbe..f5c278662 100644 --- a/code/ryzom/common/src/game_share/properties.h +++ b/code/ryzom/common/src/game_share/properties.h @@ -202,7 +202,7 @@ public: void setAllFlags() { _Properties.properties = 0xffff; } /// serial - void serial (NLMISC::IStream &f) throw (NLMISC::EStream) + void serial (NLMISC::IStream &f) { f.serial( _Properties.properties ); }