aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Wouter van Kesteren <woutershep@gmail.com> 2015-05-02 19:31:02 +0200
committerAvatar Wouter van Kesteren <woutershep@gmail.com> 2015-05-02 21:57:30 +0200
commit16acb5e446ea244c88cae8c25b4a6bd9cc8bae7d (patch)
tree7a04f0145c6f256363d465b15cc9016230f62990
parent85d89c12188201297828c92ae60655ac93626361 (diff)
downloadpaludis-16acb5e446ea244c88cae8c25b4a6bd9cc8bae7d.tar.gz
paludis-16acb5e446ea244c88cae8c25b4a6bd9cc8bae7d.tar.xz
GCC 5.1 compatibility
Change-Id: I2cb6e653147e64f8e85583e03d1c0a2fb846335e Reported-by: Marc Duponcheel <marc@offline.be>
-rw-r--r--paludis/resolver/collect_depped_upon.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/paludis/resolver/collect_depped_upon.cc b/paludis/resolver/collect_depped_upon.cc
index ef88ea7..1dbc7a3 100644
--- a/paludis/resolver/collect_depped_upon.cc
+++ b/paludis/resolver/collect_depped_upon.cc
@@ -41,6 +41,7 @@
#include <paludis/slot.hh>
#include <algorithm>
+#include <initializer_list>
#include <sstream>
using namespace paludis;
@@ -239,10 +240,9 @@ paludis::resolver::dependent_upon(
}
else
{
- auto k { &PackageID::build_dependencies_key, &PackageID::run_dependencies_key, &PackageID::post_dependencies_key };
- for (auto i(k.begin()), i_end(k.end()) ; i != i_end ; ++i)
+ for (auto& fn : { &PackageID::build_dependencies_key, &PackageID::run_dependencies_key, &PackageID::post_dependencies_key })
{
- auto key(((*id).*(*i))());
+ auto key(((*id).*fn)());
if (key)
{
c.labels_stack.push_front(key->initial_labels());