Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-strategy/wesnoth/files: wesnoth-1.10.4-boost.patch
Date: Sun, 04 Nov 2012 05:13:05
Message-Id: 20121104051242.CCE5E215F3@flycatcher.gentoo.org
1 mr_bones_ 12/11/04 05:12:42
2
3 Added: wesnoth-1.10.4-boost.patch
4 Log:
5 add upstream patch for building against newer boost (bug #440742)
6
7 (Portage version: 2.1.11.9/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 games-strategy/wesnoth/files/wesnoth-1.10.4-boost.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/wesnoth/files/wesnoth-1.10.4-boost.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/wesnoth/files/wesnoth-1.10.4-boost.patch?rev=1.1&content-type=text/plain
14
15 Index: wesnoth-1.10.4-boost.patch
16 ===================================================================
17 --- branches/1.10/src/image.cpp 2012/11/03 15:08:51 55641
18 +++ branches/1.10/src/image.cpp 2012/11/03 15:22:21 55642
19 @@ -349,7 +349,11 @@
20 using boost::hash_value;
21 using boost::hash_combine;
22
23 - size_t hash = hash_value(val.type_);
24 + /*
25 + * Boost 1.51.0 seems not longer accept an enumerate value in its hash
26 + * function so cast it to a type it does like.
27 + */
28 + size_t hash = hash_value(static_cast<unsigned>(val.type_));
29 if (val.type_ == locator::FILE || val.type_ == locator::SUB_FILE) {
30 hash_combine(hash, val.filename_);
31 }