aboutsummaryrefslogtreecommitdiff
path: root/paludis/fs_merger.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/fs_merger.hh
parent7f7c79fcc67df4fae498ca943e36592d3f7a3ad2 (diff)
downloadpaludis-7a2c9e974666881f44406c88189ae546a67ff0b7.tar.gz
paludis-7a2c9e974666881f44406c88189ae546a67ff0b7.tar.xz
Rework Pimp to avoid ImpPtr ickiness
Fixes: ticket:1070
Diffstat (limited to 'paludis/fs_merger.hh')
-rw-r--r--paludis/fs_merger.hh5
1 files changed, 2 insertions, 3 deletions
diff --git a/paludis/fs_merger.hh b/paludis/fs_merger.hh
index 859f6e87a..5713b52da 100644
--- a/paludis/fs_merger.hh
+++ b/paludis/fs_merger.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
@@ -127,7 +127,6 @@ namespace paludis
* \since 0.51 called FSMerger instead of Merger
*/
class PALUDIS_VISIBLE FSMerger :
- private Pimp<FSMerger>,
public Merger
{
private:
@@ -135,7 +134,7 @@ namespace paludis
void relabel_dir_recursive(const FSPath &, const FSPath &);
void try_to_copy_xattrs(const FSPath &, int, FSMergerStatusFlags &);
- Pimp<FSMerger>::ImpPtr & _imp;
+ Pimp<FSMerger> _imp;
protected:
///\name Basic operations