Date: Mon, 22 Oct 2018 20:31:03 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482790 - head/games/wesnoth/files Message-ID: <201810222031.w9MKV3uY099283@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Oct 22 20:31:03 2018 New Revision: 482790 URL: https://svnweb.freebsd.org/changeset/ports/482790 Log: games/wesnoth: unbreak with boost 1.69 src/units/frame.cpp:463:53: error: no viable conversion from 'const boost::tribool' to 'bool' v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_)); ^~~~~~~~~~~ src/serialization/string_utils.hpp:282:36: note: passing argument to parameter 'value' here std::string bool_string(const bool value); ^ src/units/frame.cpp:467:53: error: no viable conversion from 'const boost::tribool' to 'bool' v.emplace_back("auto_hflip=" + utils::bool_string(auto_hflip_)); ^~~~~~~~~~~ src/serialization/string_utils.hpp:282:36: note: passing argument to parameter 'value' here std::string bool_string(const bool value); ^ src/units/frame.cpp:471:56: error: no viable conversion from 'const boost::tribool' to 'bool' v.emplace_back("primary_frame=" + utils::bool_string(primary_frame_)); ^~~~~~~~~~~~~~ src/serialization/string_utils.hpp:282:36: note: passing argument to parameter 'value' here std::string bool_string(const bool value); ^ src/units/frame.cpp:775:13: error: no viable conversion from 'boost::logic::tribool' to 'const bool' const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 232525 Added: head/games/wesnoth/files/patch-boost-1.69 (contents, props changed) Added: head/games/wesnoth/files/patch-boost-1.69 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wesnoth/files/patch-boost-1.69 Mon Oct 22 20:31:03 2018 (r482790) @@ -0,0 +1,32 @@ +https://github.com/wesnoth/wesnoth/issues/3646 + +--- src/units/frame.cpp.orig 2018-09-16 07:27:00 UTC ++++ src/units/frame.cpp +@@ -460,15 +460,15 @@ std::vector<std::string> frame_parsed_parameters::debu + } + + if(!boost::indeterminate(auto_vflip_)) { +- v.emplace_back("auto_vflip=" + utils::bool_string(auto_vflip_)); ++ v.emplace_back("auto_vflip=" + utils::bool_string(bool{auto_vflip_})); + } + + if(!boost::indeterminate(auto_hflip_)) { +- v.emplace_back("auto_hflip=" + utils::bool_string(auto_hflip_)); ++ v.emplace_back("auto_hflip=" + utils::bool_string(bool{auto_hflip_})); + } + + if(!boost::indeterminate(primary_frame_)) { +- v.emplace_back("primary_frame=" + utils::bool_string(primary_frame_)); ++ v.emplace_back("primary_frame=" + utils::bool_string(bool{primary_frame_})); + } + + if(!drawing_layer_.get_original().empty()) { +@@ -772,7 +772,7 @@ const frame_parameters unit_frame::merge_parameters(in + } + + // Convert the tribool to bool +- const bool primary = result.primary_frame == true || boost::logic::indeterminate(result.primary_frame); ++ const bool primary{result.primary_frame == true || boost::logic::indeterminate(result.primary_frame)}; + + /** The engine provides a default image to use for the unit when none is available */ + result.image = current_val.image.is_void() || current_val.image.get_filename().empty()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810222031.w9MKV3uY099283>