[Commits] [wesnoth/wesnoth] 19d6d4: gui2/tmp_staging: Fix build with GCC 6.1.1

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 19d6d458008ed9b9364cbe766557eba6ba710e43
      https://github.com/wesnoth/wesnoth/commit/19d6d458008ed9b9364cbe766557eba6ba710e43
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
    M src/gui/dialogs/multiplayer/mp_staging.cpp

  Log Message:
  -----------
  gui2/tmp_staging: Fix build with GCC 6.1.1

Fixes an error where template argument deduction fails due to a function
pointer involved in a template function passed to std::bind.


  Commit: db0b20dae77492ae7ef4eab3d99a644a88c33ea9
      https://github.com/wesnoth/wesnoth/commit/db0b20dae77492ae7ef4eab3d99a644a88c33ea9
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
    M src/gui/widgets/text.cpp
    M src/gui/widgets/text.hpp

  Log Message:
  -----------
  gui2/ttext_: Refactor cursor timer setup code

This also makes sure the timer id is set to zero after removing the
timer.


Compare: https://github.com/wesnoth/wesnoth/compare/7630651ea075...db0b20dae774