aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/virtuals
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/virtuals')
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc5
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh7
-rw-r--r--paludis/repositories/virtuals/package_id.cc8
-rw-r--r--paludis/repositories/virtuals/package_id.hh10
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc3
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh5
6 files changed, 15 insertions, 23 deletions
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index 43e73081e..8d22042fa 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -116,8 +116,7 @@ InstalledVirtualsRepository::InstalledVirtualsRepository(const Environment * con
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- Pimp<InstalledVirtualsRepository>(env, r),
- _imp(Pimp<InstalledVirtualsRepository>::_imp)
+ _imp(env, r)
{
add_metadata_key(_imp->root_key);
add_metadata_key(_imp->format_key);
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index a6b78be47..615e6f9c5 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -35,11 +35,10 @@ namespace paludis
class PALUDIS_VISIBLE InstalledVirtualsRepository :
public Repository,
public RepositoryDestinationInterface,
- public std::enable_shared_from_this<InstalledVirtualsRepository>,
- private Pimp<InstalledVirtualsRepository>
+ public std::enable_shared_from_this<InstalledVirtualsRepository>
{
private:
- Pimp<InstalledVirtualsRepository>::ImpPtr & _imp;
+ Pimp<InstalledVirtualsRepository> _imp;
void need_ids() const;
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index 4f230042d..c6b20de1d 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -97,8 +97,7 @@ VirtualsDepKey::VirtualsDepKey(const Environment * const e, const std::string &
const std::shared_ptr<const PackageID> & v,
const std::shared_ptr<const DependenciesLabelSequence> & l,
const bool exact) :
- Pimp<VirtualsDepKey>(e, v, l, exact, r, h),
- _imp(Pimp<VirtualsDepKey>::_imp)
+ _imp(e, v, l, exact, r, h)
{
}
@@ -202,8 +201,7 @@ VirtualsPackageID::VirtualsPackageID(
const QualifiedPackageName & virtual_name,
const std::shared_ptr<const PackageID> & virtual_for,
const bool exact) :
- Pimp<VirtualsPackageID>(e, r, virtual_name, virtual_for, exact),
- _imp(Pimp<VirtualsPackageID>::_imp)
+ _imp(e, r, virtual_name, virtual_for, exact)
{
add_metadata_key(_imp->virtual_for);
add_metadata_key(_imp->bdep);
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index 00152a1b0..ef1f5f2ee 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -29,11 +29,10 @@ namespace paludis
namespace virtuals
{
class VirtualsDepKey :
- public MetadataSpecTreeKey<DependencySpecTree>,
- private Pimp<VirtualsDepKey>
+ public MetadataSpecTreeKey<DependencySpecTree>
{
private:
- Pimp<VirtualsDepKey>::ImpPtr & _imp;
+ Pimp<VirtualsDepKey> _imp;
public:
VirtualsDepKey(const Environment * const, const std::string &, const std::string &,
@@ -58,11 +57,10 @@ namespace paludis
};
class VirtualsPackageID :
- private Pimp<VirtualsPackageID>,
public PackageID
{
private:
- Pimp<VirtualsPackageID>::ImpPtr & _imp;
+ Pimp<VirtualsPackageID> _imp;
protected:
virtual void need_keys_added() const;
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index c1af193d1..8d9340f6c 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -129,8 +129,7 @@ VirtualsRepository::VirtualsRepository(const Environment * const env) :
n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
- Pimp<VirtualsRepository>(env),
- _imp(Pimp<VirtualsRepository>::_imp)
+ _imp(env)
{
add_metadata_key(_imp->format_key);
}
diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh
index 649eda329..048bc9e3d 100644
--- a/paludis/repositories/virtuals/virtuals_repository.hh
+++ b/paludis/repositories/virtuals/virtuals_repository.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -34,11 +34,10 @@ namespace paludis
class PALUDIS_VISIBLE VirtualsRepository :
public Repository,
public RepositoryMakeVirtualsInterface,
- private Pimp<VirtualsRepository>,
public std::enable_shared_from_this<VirtualsRepository>
{
private:
- Pimp<VirtualsRepository>::ImpPtr & _imp;
+ Pimp<VirtualsRepository> _imp;
void need_names() const;
void need_ids() const;