aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Stephen P. Bennett <spb@exherbo.org> 2007-02-08 15:26:50 +0000
committerAvatar Stephen P. Bennett <spb@exherbo.org> 2007-02-08 15:26:50 +0000
commitf9251613a3b990707c03f5db90db20ca16c9893f (patch)
treef659ebea2e9e51228269361884cb01165d4b5462
parent8f73320c89ab6157d5f9de605c0f6c0246fa1e15 (diff)
downloadpaludis-f9251613a3b990707c03f5db90db20ca16c9893f.tar.gz
paludis-f9251613a3b990707c03f5db90db20ca16c9893f.tar.xz
Fix build on selinux because ciaranm fails it
-rw-r--r--ebuild/merge.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/ebuild/merge.cc b/ebuild/merge.cc
index e11e8a1..1b1781e 100644
--- a/ebuild/merge.cc
+++ b/ebuild/merge.cc
@@ -147,7 +147,7 @@ namespace
{
FSCreateCon *p = new FSCreateCon(MatchPathCon::get_instance()->match(dst_dir_str.substr(root_str.length()),
mode));
- createcon.assign(p);
+ createcon.reset(p);
}
#endif
@@ -247,9 +247,9 @@ namespace
* disk write may not have synced. */
{
#ifdef HAVE_SELINUX
- CountedPtr<FSCreateCon, count_policy::ExternalCountTag> createcon(0);
+ std::tr1::shared_ptr<FSCreateCon> createcon;
if (MatchPathCon::get_instance()->good())
- createcon.assign(new
+ createcon.reset(new
FSCreateCon(MatchPathCon::get_instance()->match(dst_dir_str.substr(root_str.length()) + "/"
+ dst.basename(), src.permissions())));
#endif
@@ -328,9 +328,9 @@ namespace
#ifdef HAVE_SELINUX
// permissions() on a symlink does weird things, but matchpathcon only cares about the file type,
// so just pass S_IFLNK.
- CountedPtr<FSCreateCon, count_policy::ExternalCountTag> createcon(0);
+ std::tr1::shared_ptr<FSCreateCon> createcon;
if (MatchPathCon::get_instance()->good())
- createcon.assign(new
+ createcon.reset(new
FSCreateCon(MatchPathCon::get_instance()->match(dst_dir_str.substr(root_str.length()) + "/"
+ dst.basename(), S_IFLNK)));
#endif