From 6bda8b8b0d4a872d68a814a055cc779e432d9a66 Mon Sep 17 00:00:00 2001
From: David Leverton <levertond@googlemail.com>
Date: Sat, 9 Feb 2013 21:18:47 +0000
Subject: Fix Python with GCC 4.7

Fixes: ticket:1259
---
 python/dep_label.cc    |  2 +-
 python/metadata_key.cc | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/python/dep_label.cc b/python/dep_label.cc
index 95b05c19d..c1d639ad5 100644
--- a/python/dep_label.cc
+++ b/python/dep_label.cc
@@ -66,7 +66,7 @@ struct class_concrete_dependencies_label :
          bp::no_init
         )
     {
-        def("__init__",
+        this->def("__init__",
                 bp::make_constructor(&make_concrete_dependencies_label<L_>),
                 "__init__(String)"
            );
diff --git a/python/metadata_key.cc b/python/metadata_key.cc
index aaa0409b0..f2f9b8561 100644
--- a/python/metadata_key.cc
+++ b/python/metadata_key.cc
@@ -783,7 +783,7 @@ struct class_set_key :
         bp::implicitly_convertible<std::shared_ptr<MetadataCollectionKeyWrapper<C_> >,
                 std::shared_ptr<MetadataKey> >();
 
-        def("parse_value", bp::pure_virtual(&MetadataCollectionKey<C_>::parse_value),
+        this->def("parse_value", bp::pure_virtual(&MetadataCollectionKey<C_>::parse_value),
                 ("parse_value() -> " + set + "\n"
                  "Fetch our value.").c_str()
            );
@@ -812,7 +812,7 @@ struct class_spec_tree_key :
         bp::implicitly_convertible<std::shared_ptr<MetadataSpecTreeKeyWrapper<C_> >,
                 std::shared_ptr<MetadataKey> >();
 
-        def("parse_value", bp::pure_virtual(&MetadataSpecTreeKey<C_>::parse_value),
+        this->def("parse_value", bp::pure_virtual(&MetadataSpecTreeKey<C_>::parse_value),
                 ("parse_value() -> " + spec_tree + "\n"
                  "Fetch our value").c_str()
            );
@@ -843,12 +843,12 @@ struct class_spec_tree_key<FetchableURISpecTree> :
         bp::implicitly_convertible<std::shared_ptr<MetadataSpecTreeKeyWrapper<FetchableURISpecTree> >,
                 std::shared_ptr<MetadataKey> >();
 
-        def("parse_value", bp::pure_virtual(&MetadataSpecTreeKey<FetchableURISpecTree>::parse_value),
+        this->def("parse_value", bp::pure_virtual(&MetadataSpecTreeKey<FetchableURISpecTree>::parse_value),
                 ("parse_value() -> " + spec_tree + "\n"
                  "Fetch our value").c_str()
            );
 
-        def("initial_label", bp::pure_virtual(&MetadataSpecTreeKey<FetchableURISpecTree>::initial_label),
+        this->def("initial_label", bp::pure_virtual(&MetadataSpecTreeKey<FetchableURISpecTree>::initial_label),
                 "initial_label() -> URILabel\n"
                 "Return a URILabel that represents the initial label to use when\n"
                 "deciding the behaviour of individual items in the heirarchy."
@@ -880,12 +880,12 @@ struct class_spec_tree_key<DependencySpecTree> :
         bp::implicitly_convertible<std::shared_ptr<MetadataSpecTreeKeyWrapper<DependencySpecTree> >,
                 std::shared_ptr<MetadataKey> >();
 
-        def("parse_value", bp::pure_virtual(&MetadataSpecTreeKey<DependencySpecTree>::parse_value),
+        this->def("parse_value", bp::pure_virtual(&MetadataSpecTreeKey<DependencySpecTree>::parse_value),
                 ("parse_value() -> " + spec_tree + "\n"
                  "Fetch our value").c_str()
            );
 
-        def("initial_labels", bp::pure_virtual(&MetadataSpecTreeKey<DependencySpecTree>::initial_labels),
+        this->def("initial_labels", bp::pure_virtual(&MetadataSpecTreeKey<DependencySpecTree>::initial_labels),
                 "initial_label() -> DependenciesLabelSequence\n"
                 "Return a DependenciesLabelSequence that represents the initial labels to use when\n"
                 "deciding the behaviour of individual items in the heirarchy."
-- 
cgit v1.2.1