Fixed: Warnings, throw(NLMISC::EStream) deprecated in C++11 and removed in C++17, and class keyword is useless

--HG--
branch : develop
hg/compatibility-develop
kervala 7 years ago
parent 613d4ddc34
commit cecfbb9df9

@ -47,7 +47,7 @@ public:
public: public:
/// Serial /// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream) void serial (NLMISC::IStream& f)
{ {
// Version number // Version number
(void)f.serialVersion (0); (void)f.serialVersion (0);
@ -83,7 +83,7 @@ class CKeyTCB : public CKey<T>
public: public:
/// Serial /// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream) void serial (NLMISC::IStream& f)
{ {
// Version number // Version number
(void)f.serialVersion (0); (void)f.serialVersion (0);
@ -130,7 +130,7 @@ class CKeyBezier : public CKey<T>
public: public:
/// Serial /// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream) void serial (NLMISC::IStream& f)
{ {
// Version number // Version number
(void)f.serialVersion (0); (void)f.serialVersion (0);
@ -180,7 +180,7 @@ template<> class CKeyTCB<NLMISC::CAngleAxis> : public CKey<NLMISC::CAngleAxis>
public: public:
/// Serial /// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream) void serial (NLMISC::IStream& f)
{ {
// Version number // Version number
(void)f.serialVersion (0); (void)f.serialVersion (0);
@ -228,7 +228,7 @@ template<> class CKeyBezier<NLMISC::CQuat> : public CKey<NLMISC::CQuat>
public: public:
/// Serial /// Serial
void serial (NLMISC::IStream& f) throw (NLMISC::EStream) void serial (NLMISC::IStream& f)
{ {
// Version number // Version number
(void)f.serialVersion (0); (void)f.serialVersion (0);

@ -166,7 +166,7 @@ public:
/// Serial the template /// Serial the template
virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream) virtual void serial (NLMISC::IStream& f)
{ {
// Serial version // Serial version
(void)f.serialVersion (0); (void)f.serialVersion (0);
@ -217,7 +217,7 @@ public:
/// Serial the template /// Serial the template
virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream) virtual void serial (NLMISC::IStream& f)
{ {
// Serial version // Serial version
(void)f.serialVersion (0); (void)f.serialVersion (0);

@ -237,7 +237,7 @@ public:
/// Serial the template /// Serial the template
virtual void serial (NLMISC::IStream& f) throw (NLMISC::EStream) virtual void serial (NLMISC::IStream& f)
{ {
// Serial version // Serial version
(void)f.serialVersion (0); (void)f.serialVersion (0);

@ -450,8 +450,8 @@ public:
} }
void serial (NLMISC::IStream &f) throw (NLMISC::EStream) void serial (NLMISC::IStream &f)
// virtual void serial (NLMISC::IStream &f) throw (NLMISC::EStream) // virtual void serial (NLMISC::IStream &f)
{ {
if (f.isReading ()) if (f.isReading ())
{ {

@ -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.serialVersion(0);
f.serial(Box); f.serial(Box);
@ -1086,7 +1086,7 @@ CSmartPtr<CPackedZone16> CPackedZone32::buildPackedZone16()
} }
// *************************************************************************************** // ***************************************************************************************
void CPackedZone16::serial(NLMISC::IStream &f) throw (NLMISC::EStream) void CPackedZone16::serial(NLMISC::IStream &f)
{ {
f.serialVersion(0); f.serialVersion(0);
f.serial(Box); f.serial(Box);

@ -77,7 +77,7 @@ struct CCharacterSummary
bool InNewbieland; bool InNewbieland;
/// serialisation coming from a stream (net message) /// serialisation coming from a stream (net message)
void serial(NLMISC::IStream &f) throw (NLMISC::EStream); void serial(NLMISC::IStream &f);
}; };
#endif #endif

@ -174,7 +174,7 @@ namespace MBEHAV
return modeToString( (EMode)Mode ); // TODO: param return modeToString( (EMode)Mode ); // TODO: param
} }
inline void serial (NLMISC::IStream &f) throw (NLMISC::EStream) inline void serial (NLMISC::IStream &f)
{ {
f.serial( RawModeAndParam ); f.serial( RawModeAndParam );
} }
@ -522,7 +522,7 @@ namespace MBEHAV
inline bool operator != ( const CBehaviour& p ) const inline bool operator != ( const CBehaviour& p ) const
{ return (Behaviour != (EBehaviour)p.Behaviour || Data != p.Data || Data2 != p.Data2 || DeltaHP != p.DeltaHP); } { 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() ) if (f.isReading() )
{ {

@ -82,7 +82,7 @@ struct SPropVisualA
bool operator != ( const SPropVisualA& p ) const { return PropertyA != p.PropertyA; } 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 ); f.serial( PropertyA );
} }
@ -132,7 +132,7 @@ struct SPropVisualB
bool operator != ( const SPropVisualB& p ) const { return PropertyB != p.PropertyB; } 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 ); f.serial( PropertyB );
} }
@ -200,7 +200,7 @@ struct SPropVisualC
bool operator != ( const SPropVisualC& p ) const { return PropertyC != p.PropertyC; } 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 ); f.serial( PropertyC );
} }
@ -286,7 +286,7 @@ struct SAltLookProp
//@} //@}
// Serial // Serial
void serial (NLMISC::IStream &f) throw (NLMISC::EStream) void serial (NLMISC::IStream &f)
{ {
f.serial( Summary ); f.serial( Summary );
} }
@ -321,7 +321,7 @@ struct SAltLookProp2
//@} //@}
// Serial // Serial
void serial (NLMISC::IStream &f) throw (NLMISC::EStream) void serial (NLMISC::IStream &f)
{ {
f.serial( Summary ); f.serial( Summary );
} }

@ -202,7 +202,7 @@ public:
void setAllFlags() { _Properties.properties = 0xffff; } void setAllFlags() { _Properties.properties = 0xffff; }
/// serial /// serial
void serial (NLMISC::IStream &f) throw (NLMISC::EStream) void serial (NLMISC::IStream &f)
{ {
f.serial( _Properties.properties ); f.serial( _Properties.properties );
} }

Loading…
Cancel
Save