Vultraz

Untitled

Jul 23rd, 2016
132
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.15 KB | None | 0 0
  1.  src/gui/dialogs/multiplayer/mp_create_game.cpp | 4 ++--
  2.  src/hotkey/command_executor.cpp                | 2 +-
  3.  src/tod_manager.cpp                            | 2 +-
  4.  3 files changed, 4 insertions(+), 4 deletions(-)
  5.  
  6. diff --git a/src/gui/dialogs/multiplayer/mp_create_game.cpp b/src/gui/dialogs/multiplayer/mp_create_game.cpp
  7. index 7944954..3667029 100644
  8. --- a/src/gui/dialogs/multiplayer/mp_create_game.cpp
  9. +++ b/src/gui/dialogs/multiplayer/mp_create_game.cpp
  10. @@ -83,9 +83,9 @@ void tmp_create_game::pre_show(twindow& window)
  11.     tlistbox& list = find_widget<tlistbox>(&window, "map_list", false);
  12.  #ifdef GUI2_EXPERIMENTAL_LISTBOX
  13.     connect_signal_notify_modified(list,
  14. -                                  boost::bind(&tmp_create_game::update_map,
  15. +                                  std::bind(&tmp_create_game::update_map,
  16.                                                *this,
  17. -                                              boost::ref(window)));
  18. +                                              std::ref(window)));
  19.  #else
  20.     list.set_callback_value_change(
  21.             dialog_callback<tmp_create_game, &tmp_create_game::update_map>);
  22. diff --git a/src/hotkey/command_executor.cpp b/src/hotkey/command_executor.cpp
  23. index fe595fe..6165959 100644
  24. --- a/src/hotkey/command_executor.cpp
  25. +++ b/src/hotkey/command_executor.cpp
  26. @@ -735,6 +735,6 @@ void command_executor_default::zoom_default()
  27.  }
  28.  void command_executor_default::map_screenshot()
  29.  {
  30. -   make_screenshot(_("Map-Screenshot"), get_video(), boost::bind(&display::screenshot, &get_display(), _1, true));
  31. +   make_screenshot(_("Map-Screenshot"), get_video(), std::bind(&display::screenshot, &get_display(), _1, true));
  32.  }
  33.  }
  34. diff --git a/src/tod_manager.cpp b/src/tod_manager.cpp
  35. index 5c4157b..763a34b 100644
  36. --- a/src/tod_manager.cpp
  37. +++ b/src/tod_manager.cpp
  38. @@ -89,7 +89,7 @@ void tod_manager::resolve_random(random_new::rng& r)
  39.     //comma-separated string of integers >= 1 referring to the times_ array indices
  40.     std::vector<int> output;
  41.     boost::copy( utils::split(random_tod_.str())
  42. -       | boost::adaptors::transformed(boost::bind(lexical_cast_default<int, std::string>, _1 , 0))
  43. +       | boost::adaptors::transformed(std::bind(lexical_cast_default<int, std::string>, _1 , 0))
  44.         | boost::adaptors::filtered(greater<int>(0))
  45.         , std::back_inserter(output) );
Advertisement
Add Comment
Please, Sign In to add comment