From 85d077ff1d58f7f28d7fe52cc83ff6c7b3481dd0 Mon Sep 17 00:00:00 2001 From: auria Date: Wed, 17 Feb 2010 16:38:46 +0000 Subject: [PATCH] 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 --- src/audio/music_information.hpp | 2 ++ src/race/grand_prix_data.hpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/audio/music_information.hpp b/src/audio/music_information.hpp index d3f2cad2d..3467d5279 100644 --- a/src/audio/music_information.hpp +++ b/src/audio/music_information.hpp @@ -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; } diff --git a/src/race/grand_prix_data.hpp b/src/race/grand_prix_data.hpp index 9ef723728..d4558eded 100644 --- a/src/race/grand_prix_data.hpp +++ b/src/race/grand_prix_data.hpp @@ -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