svn commit: r482791 - head/games/glob2/files
Jan Beich
jbeich at FreeBSD.org
Mon Oct 22 20:31:21 UTC 2018
Author: jbeich
Date: Mon Oct 22 20:31:20 2018
New Revision: 482791
URL: https://svnweb.freebsd.org/changeset/ports/482791
Log:
games/glob2: unbreak with boost 1.69
src/AIEcho.cpp:4390:9: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool'
return is_end!=rhs.is_end || team!=rhs.team || building_type!=rhs.building_type || level!=rhs.level || construction_site!=rhs.construction_site;
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
PR: 232525
Added:
head/games/glob2/files/patch-boost-1.69 (contents, props changed)
Added: head/games/glob2/files/patch-boost-1.69
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/glob2/files/patch-boost-1.69 Mon Oct 22 20:31:20 2018 (r482791)
@@ -0,0 +1,17 @@
+After https://github.com/boostorg/logic/commit/23cd89d4c80f build fails:
+
+src/AIEcho.cpp:4390:9: error: no viable conversion from returned value of type 'boost::logic::tribool' to function return type 'bool'
+ return is_end!=rhs.is_end || team!=rhs.team || building_type!=rhs.building_type || level!=rhs.level || construction_site!=rhs.construction_site;
+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+--- src/AIEcho.cpp.orig 2009-08-29 20:39:05 UTC
++++ src/AIEcho.cpp
+@@ -4387,7 +4387,7 @@ bool enemy_building_iterator::operator!=(const enemy_b
+ {
+ if(is_end && rhs.is_end)
+ return false;
+- return is_end!=rhs.is_end || team!=rhs.team || building_type!=rhs.building_type || level!=rhs.level || construction_site!=rhs.construction_site;
++ return bool(is_end!=rhs.is_end || team!=rhs.team || building_type!=rhs.building_type || level!=rhs.level || construction_site!=rhs.construction_site);
+ }
+
+
More information about the svn-ports-all
mailing list