Don't let the fix for a Windows warning create warnings elsewhere
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4752 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
7416a2c7b3
commit
85d077ff1d
@ -56,7 +56,9 @@ private:
|
||||
float m_time_since_faster;
|
||||
|
||||
public:
|
||||
#if defined(WIN32) || defined(_WIN32)
|
||||
#pragma warning(disable:4290)
|
||||
#endif
|
||||
MusicInformation (const std::string& filename) throw (std::runtime_error);
|
||||
const std::string& getComposer () const {return m_composer; }
|
||||
const std::string& getTitle () const {return m_title; }
|
||||
|
@ -49,7 +49,9 @@ class GrandPrixData
|
||||
public:
|
||||
|
||||
/** Load the GrandPrixData from the given filename */
|
||||
#if defined(WIN32) || defined(_WIN32)
|
||||
#pragma warning(disable:4290)
|
||||
#endif
|
||||
GrandPrixData (const std::string filename) throw(std::logic_error);
|
||||
GrandPrixData () {}; // empty for initialising
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user