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

Work around some weird compiler bug with VS using C++17

Browse source 
Without this, I get the error "syntax error: '<'" and a reference to the function's
opening bracket... No idea why. It build fine on VS 15.7.1 with C++14.
This commit is contained in:
Charles Dang 2018-05-11 16:08:42 +11:00
parent 0f9a0fac5e
commit 1c575f59fa
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gui/core/event/dispatcher_private.hpp
View file

@ -291,8 +291,7 @@ inline bool fire_event(const ui_event event,
/***** ***** ***** Pre ***** ***** *****/
for(auto& ritor_widget : boost::adaptors::reverse(event_chain)) {
dispatcher::signal_type<T>& signal =
dispatcher_implementation::event_signal<T>(*ritor_widget.first, ritor_widget.second);
auto& signal = dispatcher_implementation::event_signal<T>(*ritor_widget.first, ritor_widget.second);
for(auto& pre_func : signal.pre_child) {
pre_func(*dispatcher, ritor_widget.second, handled, halt, std::forward<F>(params)...);
@ -310,8 +309,7 @@ inline bool fire_event(const ui_event event,
/***** ***** ***** Child ***** ***** *****/
if(w->has_event(event, dispatcher::child)) {
dispatcher::signal_type<T>& signal =
dispatcher_implementation::event_signal<T>(*w, event);
auto& signal = dispatcher_implementation::event_signal<T>(*w, event);
for(auto& func : signal.child) {
func(*dispatcher, event, handled, halt, std::forward<F>(params)...);
@ -329,8 +327,7 @@ inline bool fire_event(const ui_event event,
/***** ***** ***** Post ***** ***** *****/
for(auto& itor_widget : event_chain) {
dispatcher::signal_type<T>& signal =
dispatcher_implementation::event_signal<T>(*itor_widget.first, itor_widget.second);
auto& signal = dispatcher_implementation::event_signal<T>(*itor_widget.first, itor_widget.second);
for(auto& post_func : signal.post_child) {
post_func(*dispatcher, itor_widget.second, handled, halt, std::forward<F>(params)...);