Post-merge tidying up

src/challenges/challenge_data.cpp

@@ -32,9 +32,6 @@
 #include "tracks/track_manager.hpp"
 
 ChallengeData::ChallengeData(const std::string& filename)
-#ifndef WIN32
-                                                      throw(std::runtime_error)
-#endif
 {
     m_filename     = filename;
     m_mode         = CM_SINGLE_RACE;

src/challenges/challenge_data.hpp

@@ -111,11 +111,7 @@ private:
     irr::core::stringw m_challenge_description;
 
 public:
-#ifdef WIN32
                  ChallengeData(const std::string& filename);
-#else
-                 ChallengeData(const std::string& filename) throw(std::runtime_error);
-#endif
 
     virtual      ~ChallengeData() {}
 

src/race/grand_prix_data.cpp

@@ -31,16 +31,15 @@
 #include <iostream>
 #include <stdexcept>
 
-GrandPrixData::GrandPrixData(const std::string filename) throw(std::logic_error)
+GrandPrixData::GrandPrixData(const std::string filename)
 {
     load_from_file(file_manager->getAsset(FileManager::GRANDPRIX, filename),
                    filename);
 }
 // ----------------------------------------------------------------------------
 GrandPrixData::GrandPrixData(const std::string dir, const std::string filename)
-                             throw(std::logic_error)
 {
-    assert(dir[dir.size()] == '/');
+    assert(dir[dir.size() - 1] == '/');
     load_from_file(dir + filename, filename);
 }
 // ----------------------------------------------------------------------------

src/race/grand_prix_data.hpp

@@ -74,9 +74,8 @@ public:
 #pragma warning(disable:4290)
 #endif
     GrandPrixData () {}; // empty for initialising
-    GrandPrixData (const std::string filename) throw(std::logic_error);
+    GrandPrixData(const std::string filename);
-    GrandPrixData (const std::string dir, const std::string filename)
+    GrandPrixData (const std::string dir, const std::string filename);
-                   throw(std::logic_error);
 
 
     bool checkConsistency(bool chatty=true) const;