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

Revert "Mark game_events::manager::execute_on_events() as noexcept"

Browse source 
This reverts commit 45cab78cfb.

Further testing indicates that exceptions can indeed pass through the
function, and therefore marking it as noexcept isn't safe.
This commit is contained in:
Jyrki Vesterinen 2018-03-10 16:25:43 +02:00
parent 45cab78cfb
commit 97183e37c8
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game_events/manager.cpp
View file

@ -117,7 +117,7 @@ void manager::write_events(config& cfg) const
wml_menu_items_.to_config(cfg);
}
void manager::execute_on_events(const std::string& event_id, manager::event_func_t func) NOEXCEPT
void manager::execute_on_events(const std::string& event_id, manager::event_func_t func)
{
const std::string standardized_event_id = event_handlers::standardize_name(event_id);
const game_data* gd = resources::gamedata;

3
src/game_events/manager.hpp
View file

@ -17,7 +17,6 @@
#include "game_events/fwd.hpp"
#include "game_events/wmi_manager.hpp"
#include "config.hpp"
#include "global.hpp"
#include <functional>
#include <set>
@ -72,7 +71,7 @@ public:
void write_events(config& cfg) const;
using event_func_t = std::function<void(game_events::manager&, handler_ptr&)>;
void execute_on_events(const std::string& event_id, event_func_t func) NOEXCEPT;
void execute_on_events(const std::string& event_id, event_func_t func);
game_events::wml_event_pump& pump();