diff options
| author | jbeich <jbeich@FreeBSD.org> | 2018-10-23 04:31:03 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2018-10-23 04:31:03 +0800 |
| commit | 85e8132e1dff622db363cbc8253e61f60081c880 (patch) | |
| tree | a3a6c56f159f0230fa54c08c4634f400569c80f1 /games | |
| parent | a2a78d8eb7364e8f2fbd77f6418053c96cb8dc41 (diff) | |
| download | freebsd-ports-gnome-85e8132e1dff622db363cbc8253e61f60081c880.tar.gz freebsd-ports-gnome-85e8132e1dff622db363cbc8253e61f60081c880.tar.zst freebsd-ports-gnome-85e8132e1dff622db363cbc8253e61f60081c880.zip | |
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
Diffstat (limited to 'games')
| -rw-r--r-- | games/wesnoth/files/patch-boost-1.69 | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/games/wesnoth/files/patch-boost-1.69 b/games/wesnoth/files/patch-boost-1.69 new file mode 100644 index 000000000000..961f8715e3ec --- /dev/null +++ b/games/wesnoth/files/patch-boost-1.69 @@ -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() |