aboutsummaryrefslogtreecommitdiff
path: root/paludis/contents.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-09 10:23:12 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-09 10:23:12 +0000
commit7a2c9e974666881f44406c88189ae546a67ff0b7 (patch)
treef6846da02bf779a262f58e5042f3fa1bbf7415d3 /paludis/contents.hh
parent7f7c79fcc67df4fae498ca943e36592d3f7a3ad2 (diff)
downloadpaludis-7a2c9e974666881f44406c88189ae546a67ff0b7.tar.gz
paludis-7a2c9e974666881f44406c88189ae546a67ff0b7.tar.xz
Rework Pimp to avoid ImpPtr ickiness
Fixes: ticket:1070
Diffstat (limited to 'paludis/contents.hh')
-rw-r--r--paludis/contents.hh14
1 files changed, 7 insertions, 7 deletions
diff --git a/paludis/contents.hh b/paludis/contents.hh
index 9b8d8e6..b4909e1 100644
--- a/paludis/contents.hh
+++ b/paludis/contents.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
@@ -51,13 +51,12 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE ContentsEntry :
- private Pimp<ContentsEntry>,
public MetadataKeyHolder,
public virtual DeclareAbstractAcceptMethods<ContentsEntry, MakeTypeList<
ContentsFileEntry, ContentsDirEntry, ContentsSymEntry, ContentsOtherEntry>::Type>
{
private:
- Pimp<ContentsEntry>::ImpPtr & _imp;
+ Pimp<ContentsEntry> _imp;
protected:
virtual void need_keys_added() const;
@@ -163,12 +162,11 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE ContentsSymEntry :
- private Pimp<ContentsSymEntry>,
public ContentsEntry,
public ImplementAcceptMethods<ContentsEntry, ContentsSymEntry>
{
private:
- Pimp<ContentsSymEntry>::ImpPtr & _imp;
+ Pimp<ContentsSymEntry> _imp;
public:
///\name Basic operations
@@ -198,9 +196,11 @@ namespace paludis
* \ingroup g_contents
* \nosubgrouping
*/
- class PALUDIS_VISIBLE Contents :
- private Pimp<Contents>
+ class PALUDIS_VISIBLE Contents
{
+ private:
+ Pimp<Contents> _imp;
+
public:
///\name Basic operations
///\{