[wesnoth-commits] [wesnoth/wesnoth] 30c7a7: Explicitly specify std::placeholders namespace for...

Charles Dang noreply at github.com
Fri Dec 4 04:32:45 UTC 2020


  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 30c7a747abde6f4567e74a4465fa69971e0fbb80
      https://github.com/wesnoth/wesnoth/commit/30c7a747abde6f4567e74a4465fa69971e0fbb80
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-04 (Fri, 04 Dec 2020)

  Changed paths:
    M src/ai/composite/ai.cpp
    M src/ai/composite/aspect.hpp
    M src/ai/default/recruitment.cpp
    M src/config_attribute_value.cpp
    M src/editor/controller/editor_controller.cpp
    M src/gui/auxiliary/field.hpp
    M src/gui/core/event/distributor.cpp
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/drop_down_menu.cpp
    M src/gui/dialogs/editor/edit_label.cpp
    M src/gui/dialogs/end_credits.cpp
    M src/gui/dialogs/file_dialog.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/gamestate_inspector.cpp
    M src/gui/dialogs/hotkey_bind.cpp
    M src/gui/dialogs/label_settings.cpp
    M src/gui/dialogs/log_settings.cpp
    M src/gui/dialogs/lua_interpreter.cpp
    M src/gui/dialogs/multiplayer/lobby.cpp
    M src/gui/dialogs/multiplayer/mp_join_game.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/story_viewer.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/dialogs/unit_recall.cpp
    M src/gui/dialogs/unit_recruit.cpp
    M src/gui/widgets/addon_list.cpp
    M src/gui/widgets/button.cpp
    M src/gui/widgets/chatbox.cpp
    M src/gui/widgets/generator.cpp
    M src/gui/widgets/group.hpp
    M src/gui/widgets/label.cpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/menu_button.cpp
    M src/gui/widgets/multimenu_button.cpp
    M src/gui/widgets/pane.cpp
    M src/gui/widgets/repeating_button.cpp
    M src/gui/widgets/scroll_label.cpp
    M src/gui/widgets/scrollbar.cpp
    M src/gui/widgets/scrollbar_container.cpp
    M src/gui/widgets/slider.cpp
    M src/gui/widgets/slider_base.cpp
    M src/gui/widgets/styled_widget.cpp
    M src/gui/widgets/text_box.cpp
    M src/gui/widgets/text_box_base.cpp
    M src/gui/widgets/toggle_button.cpp
    M src/gui/widgets/toggle_panel.cpp
    M src/gui/widgets/tree_view.cpp
    M src/gui/widgets/tree_view_node.cpp
    M src/gui/widgets/window.cpp
    M src/network_asio.cpp
    M src/playturn_network_adapter.cpp
    M src/scripting/application_lua_kernel.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_gui2.cpp
    M src/scripting/lua_kernel_base.cpp
    M src/scripting/mapgen_lua_kernel.cpp
    M src/serialization/schema_validator.cpp
    M src/server/campaignd/server.cpp
    M src/server/common/server_base.cpp
    M src/server/wesnothd/ban.cpp
    M src/server/wesnothd/server.cpp
    M src/wesnothd_connection.cpp

  Log Message:
  -----------
  Explicitly specify std::placeholders namespace for all bind placeholders

Apparently, even on Boost 1.73 without Boost placeholders specialized as is_placeholder, they were somehow
getting used in the global namespace. Would explain all the "Boost placeholders in the global namespace is
deprecated" warnings I was getting after 23d1db043f9f8266c77c6270ed4ef3eafbc0cf67.

When testing with BOOST_BIND_NO_PLACEHOLDERS, even though I had `using namespace std::placeholders` in utils/functional.hpp,
compilation still failed in places. This confirms even more that Boost global placeholders were being used. Honestly,
it was simplest just to specify std::placeholders for everything. This also means we can remove the hack in utils/functional.hpp
designed to allow Boost placeholders to work with `std::bind`.


  Commit: 6e2f3e099ebb2deb69eca3c5fe343b5502e72bb4
      https://github.com/wesnoth/wesnoth/commit/6e2f3e099ebb2deb69eca3c5fe343b5502e72bb4
  Author: Charles Dang <exodia339 at gmail.com>
  Date:   2020-12-04 (Fri, 04 Dec 2020)

  Changed paths:
    M projectfiles/CodeBlocks-SCons/wesnoth.cbp
    M projectfiles/CodeBlocks/tests.cbp
    M projectfiles/CodeBlocks/wesnoth.cbp
    M projectfiles/VC16/wesnoth.vcxproj
    M projectfiles/VC16/wesnoth.vcxproj.filters
    M src/ai/composite/ai.cpp
    M src/ai/composite/aspect.hpp
    M src/ai/composite/property_handler.hpp
    M src/ai/default/stage_rca.cpp
    M src/config.cpp
    M src/config_attribute_value.cpp
    M src/display.hpp
    M src/editor/controller/editor_controller.cpp
    M src/game_initialization/multiplayer.cpp
    M src/game_state.cpp
    M src/gui/core/event/dispatcher.hpp
    M src/gui/core/event/distributor.cpp
    M src/gui/core/static_registry.cpp
    M src/gui/core/timer.hpp
    M src/gui/core/window_builder.cpp
    M src/gui/core/window_builder.hpp
    M src/gui/dialogs/addon/connect.cpp
    M src/gui/dialogs/addon/manager.cpp
    M src/gui/dialogs/campaign_selection.cpp
    M src/gui/dialogs/chat_log.cpp
    M src/gui/dialogs/core_selection.cpp
    M src/gui/dialogs/debug_clock.cpp
    M src/gui/dialogs/drop_down_menu.cpp
    M src/gui/dialogs/editor/custom_tod.cpp
    M src/gui/dialogs/editor/edit_label.cpp
    M src/gui/dialogs/editor/edit_side.cpp
    M src/gui/dialogs/editor/generate_map.cpp
    M src/gui/dialogs/editor/generator_settings.cpp
    M src/gui/dialogs/editor/resize_map.cpp
    M src/gui/dialogs/end_credits.cpp
    M src/gui/dialogs/formula_debugger.cpp
    M src/gui/dialogs/game_cache_options.cpp
    M src/gui/dialogs/game_load.cpp
    M src/gui/dialogs/game_stats.cpp
    M src/gui/dialogs/game_version_dialog.cpp
    M src/gui/dialogs/gamestate_inspector.cpp
    M src/gui/dialogs/loading_screen.cpp
    M src/gui/dialogs/lua_interpreter.cpp
    M src/gui/dialogs/modal_dialog.hpp
    M src/gui/dialogs/multiplayer/faction_select.cpp
    M src/gui/dialogs/multiplayer/lobby.cpp
    M src/gui/dialogs/multiplayer/mp_alerts_options.cpp
    M src/gui/dialogs/multiplayer/mp_change_control.cpp
    M src/gui/dialogs/multiplayer/mp_connect.cpp
    M src/gui/dialogs/multiplayer/player_info.cpp
    M src/gui/dialogs/multiplayer/synced_choice_wait.cpp
    M src/gui/dialogs/preferences_dialog.cpp
    M src/gui/dialogs/screenshot_notification.cpp
    M src/gui/dialogs/select_orb_colors.cpp
    M src/gui/dialogs/statistics_dialog.cpp
    M src/gui/dialogs/title_screen.cpp
    M src/gui/dialogs/unit_advance.cpp
    M src/gui/dialogs/unit_attack.cpp
    M src/gui/dialogs/unit_create.cpp
    M src/gui/dialogs/unit_list.cpp
    M src/gui/dialogs/unit_recall.cpp
    M src/gui/dialogs/unit_recruit.cpp
    M src/gui/dialogs/wml_error.cpp
    M src/gui/widgets/button.cpp
    M src/gui/widgets/drawing.cpp
    M src/gui/widgets/group.hpp
    M src/gui/widgets/horizontal_scrollbar.cpp
    M src/gui/widgets/image.cpp
    M src/gui/widgets/label.cpp
    M src/gui/widgets/listbox.cpp
    M src/gui/widgets/matrix.cpp
    M src/gui/widgets/menu_button.cpp
    M src/gui/widgets/minimap.cpp
    M src/gui/widgets/multi_page.cpp
    M src/gui/widgets/multimenu_button.cpp
    M src/gui/widgets/pane.cpp
    M src/gui/widgets/pane.hpp
    M src/gui/widgets/panel.cpp
    M src/gui/widgets/password_box.cpp
    M src/gui/widgets/progress_bar.cpp
    M src/gui/widgets/repeating_button.cpp
    M src/gui/widgets/scroll_label.cpp
    M src/gui/widgets/scrollbar.cpp
    M src/gui/widgets/scrollbar.hpp
    M src/gui/widgets/scrollbar_container.cpp
    M src/gui/widgets/scrollbar_panel.cpp
    M src/gui/widgets/selectable_item.hpp
    M src/gui/widgets/slider.cpp
    M src/gui/widgets/slider_base.cpp
    M src/gui/widgets/slider_base.hpp
    M src/gui/widgets/spacer.cpp
    M src/gui/widgets/stacked_widget.cpp
    M src/gui/widgets/status_label_helper.hpp
    M src/gui/widgets/styled_widget.cpp
    M src/gui/widgets/text_box.cpp
    M src/gui/widgets/text_box_base.cpp
    M src/gui/widgets/text_box_base.hpp
    M src/gui/widgets/toggle_button.cpp
    M src/gui/widgets/toggle_panel.cpp
    M src/gui/widgets/tree_view.cpp
    M src/gui/widgets/tree_view_node.cpp
    M src/gui/widgets/unit_preview_pane.cpp
    M src/gui/widgets/vertical_scrollbar.cpp
    M src/gui/widgets/window.cpp
    M src/hotkey/command_executor.cpp
    M src/hotkey/hotkey_item.cpp
    M src/network_asio.cpp
    M src/picture.cpp
    M src/play_controller.cpp
    M src/playturn_network_adapter.cpp
    M src/playturn_network_adapter.hpp
    M src/quit_confirmation.hpp
    M src/random_synced.hpp
    M src/recall_list_manager.cpp
    M src/scripting/application_lua_kernel.cpp
    M src/scripting/game_lua_kernel.cpp
    M src/scripting/lua_cpp_function.hpp
    M src/scripting/lua_gui2.cpp
    M src/scripting/lua_kernel_base.cpp
    M src/scripting/lua_kernel_base.hpp
    M src/scripting/lua_widget_attributes.cpp
    M src/scripting/lua_widget_methods.cpp
    M src/scripting/mapgen_lua_kernel.cpp
    M src/scripting/plugins/context.cpp
    M src/scripting/plugins/context.hpp
    M src/server/campaignd/server.hpp
    M src/server/common/server_base.cpp
    M src/server/wesnothd/ban.cpp
    M src/server/wesnothd/player_network.hpp
    M src/server/wesnothd/server.cpp
    M src/synced_commands.hpp
    M src/synced_context.hpp
    M src/tests/gui/fire_event.cpp
    M src/tests/gui/test_gui2.cpp
    M src/tests/test_config_cache.cpp
    M src/tests/test_map_location.cpp
    M src/tests/test_unit_map.cpp
    M src/tod_manager.cpp
    M src/units/unit.cpp
    R src/utils/functional.hpp
    M src/wesnoth.cpp
    M src/wesnothd_connection.cpp
    M src/whiteboard/highlighter.cpp
    M src/whiteboard/manager.cpp
    M src/whiteboard/utility.hpp
    M src/xBRZ/xbrz.cpp

  Log Message:
  -----------
  Removed utils/functional.hpp


Compare: https://github.com/wesnoth/wesnoth/compare/472fba4e76f1...6e2f3e099ebb



More information about the Commits mailing list