0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make type_error and parse_error inherit from game::error

Browse source
This commit is contained in:
Alexander van Gessel 2010-08-07 02:21:29 +01:00
parent e177c3da3d
commit 6ff8ec8748
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/help.cpp
View file

@ -23,6 +23,7 @@
#include "about.hpp"
#include "display.hpp"
#include "exceptions.hpp"
#include "foreach.hpp"
#include "game_preferences.hpp"
#include "gettext.hpp"
@ -325,10 +326,9 @@ private:
};
/// Thrown when the help system fails to parse something.
struct parse_error
struct parse_error : public game::error
{
parse_error(const std::string& msg) : message(msg) {}
std::string message;
parse_error(const std::string& msg) : game::error(msg) {}
};
/// The area where the content is shown in the help browser.

2
src/variant.cpp
View file

@ -61,7 +61,7 @@ std::string get_call_stack()
return res;
}
type_error::type_error(const std::string& str) : message(str) {
type_error::type_error(const std::string& str) : game::error(str) {
std::cerr << "ERROR: " << message << "\n" << get_call_stack();
}

5
src/variant.hpp
View file

@ -6,6 +6,8 @@
#include <map>
#include <vector>
#include "exceptions.hpp"
namespace game_logic {
class formula_callable;
}
@ -29,9 +31,8 @@ struct variant_string;
struct variant_map;
class variant_iterator;
struct type_error {
struct type_error : public game::error {
explicit type_error(const std::string& str);
std::string message;
};