Fix some warnings on Windows
This was SVN commit r8834.
This commit is contained in:
parent
ad3f33dd27
commit
802f22485b
@ -38,7 +38,7 @@
|
|||||||
//# pragma warning(default:4263) // member function does not override any base class virtual member function (happens in GUI)
|
//# pragma warning(default:4263) // member function does not override any base class virtual member function (happens in GUI)
|
||||||
# pragma warning(default:4265) // class has virtual functions, but destructor is not virtual
|
# pragma warning(default:4265) // class has virtual functions, but destructor is not virtual
|
||||||
# pragma warning(default:4296) // [unsigned comparison vs. 0 =>] expression is always false
|
# pragma warning(default:4296) // [unsigned comparison vs. 0 =>] expression is always false
|
||||||
# pragma warning(default:4545 4546 4547 4548 4549) // ill-formed comma expressions
|
# pragma warning(default:4545 4546 4547 4549) // ill-formed comma expressions; exclude 4548 since _SECURE_SCL triggers it frequently
|
||||||
//# pragma warning(default:4555) // expression has no effect (triggered by STL unused)
|
//# pragma warning(default:4555) // expression has no effect (triggered by STL unused)
|
||||||
# pragma warning(default:4557) // __assume contains effect
|
# pragma warning(default:4557) // __assume contains effect
|
||||||
//# pragma warning(default:4619) // #pragma warning: there is no [such] warning number (false alarms in STL)
|
//# pragma warning(default:4619) // #pragma warning: there is no [such] warning number (false alarms in STL)
|
||||||
|
@ -88,6 +88,7 @@ enum
|
|||||||
|
|
||||||
struct FormatChunk
|
struct FormatChunk
|
||||||
{
|
{
|
||||||
|
virtual ~FormatChunk() { }
|
||||||
virtual int ChunkType() = 0; // 0 = FormatSpecification, 1 = FormatString
|
virtual int ChunkType() = 0; // 0 = FormatSpecification, 1 = FormatString
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -307,4 +307,7 @@ LIB_API void SDL_WM_SetCaption(const char *title, const char *icon);
|
|||||||
|
|
||||||
LIB_API Uint8 SDL_GetAppState();
|
LIB_API Uint8 SDL_GetAppState();
|
||||||
|
|
||||||
|
// Pretend that we always implement the latest version of SDL
|
||||||
|
#define SDL_VERSION_ATLEAST(X, Y, Z) 1
|
||||||
|
|
||||||
#endif // #ifndef INCLUDED_WSDL
|
#endif // #ifndef INCLUDED_WSDL
|
||||||
|
Loading…
Reference in New Issue
Block a user