aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/dep_spec.cc6
-rw-r--r--python/dep_spec.hh10
-rw-r--r--python/exception.cc2
-rw-r--r--python/exception.hh4
4 files changed, 13 insertions, 9 deletions
diff --git a/python/dep_spec.cc b/python/dep_spec.cc
index c2c0972c3..fbe91c781 100644
--- a/python/dep_spec.cc
+++ b/python/dep_spec.cc
@@ -114,7 +114,7 @@ namespace paludis
}
PythonCompositeDepSpec::PythonCompositeDepSpec() :
- Pimp<PythonCompositeDepSpec>()
+ _imp()
{
}
@@ -225,7 +225,7 @@ deep_copy(const std::shared_ptr<const T_> & x)
PythonPackageDepSpec::PythonPackageDepSpec(const PackageDepSpec & p) :
PythonStringDepSpec(p.text()),
- Pimp<PythonPackageDepSpec>(
+ _imp(
deep_copy(p.package_ptr()),
deep_copy(p.category_name_part_ptr()),
deep_copy(p.package_name_part_ptr()),
@@ -247,7 +247,7 @@ PythonPackageDepSpec::PythonPackageDepSpec(const PackageDepSpec & p) :
PythonPackageDepSpec::PythonPackageDepSpec(const PythonPackageDepSpec & p) :
PythonStringDepSpec(p.text()),
- Pimp<PythonPackageDepSpec>(
+ _imp(
deep_copy(p.package_ptr()),
deep_copy(p.category_name_part_ptr()),
deep_copy(p.package_name_part_ptr()),
diff --git a/python/dep_spec.hh b/python/dep_spec.hh
index 4f9daabf5..70b4a792c 100644
--- a/python/dep_spec.hh
+++ b/python/dep_spec.hh
@@ -75,9 +75,11 @@ namespace paludis
};
class PALUDIS_VISIBLE PythonCompositeDepSpec :
- public PythonDepSpec,
- private Pimp<PythonCompositeDepSpec>
+ public PythonDepSpec
{
+ private:
+ Pimp<PythonCompositeDepSpec> _imp;
+
protected:
PythonCompositeDepSpec();
@@ -157,9 +159,11 @@ namespace paludis
class PALUDIS_VISIBLE PythonPackageDepSpec :
public PythonStringDepSpec,
- private Pimp<PythonPackageDepSpec>,
public ImplementAcceptMethods<PythonDepSpec, PythonPackageDepSpec>
{
+ private:
+ Pimp<PythonPackageDepSpec> _imp;
+
public:
PythonPackageDepSpec(const PackageDepSpec &);
PythonPackageDepSpec(const PythonPackageDepSpec &);
diff --git a/python/exception.cc b/python/exception.cc
index 126a6d76f..0da8e51c4 100644
--- a/python/exception.cc
+++ b/python/exception.cc
@@ -46,7 +46,7 @@ namespace paludis
}
ExceptionRegister::ExceptionRegister() :
- Pimp<ExceptionRegister>()
+ _imp()
{
}
diff --git a/python/exception.hh b/python/exception.hh
index 37baca079..767ab9aab 100644
--- a/python/exception.hh
+++ b/python/exception.hh
@@ -89,12 +89,12 @@ namespace paludis
}
class PALUDIS_VISIBLE ExceptionRegister :
- public Singleton<ExceptionRegister>,
- private Pimp<ExceptionRegister>
+ public Singleton<ExceptionRegister>
{
friend class Singleton<ExceptionRegister>;
private:
+ Pimp<ExceptionRegister> _imp;
ExceptionRegister();
void add_map_item(const std::string & name, std::shared_ptr<RegisteredExceptionBase>);