aboutsummaryrefslogtreecommitdiff
path: root/paludis/util/process.cc
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/util/process.cc
parent7f7c79fcc67df4fae498ca943e36592d3f7a3ad2 (diff)
downloadpaludis-7a2c9e974666881f44406c88189ae546a67ff0b7.tar.gz
paludis-7a2c9e974666881f44406c88189ae546a67ff0b7.tar.xz
Rework Pimp to avoid ImpPtr ickiness
Fixes: ticket:1070
Diffstat (limited to 'paludis/util/process.cc')
-rw-r--r--paludis/util/process.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/paludis/util/process.cc b/paludis/util/process.cc
index 0e00723fb..8e971f5ba 100644
--- a/paludis/util/process.cc
+++ b/paludis/util/process.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2010 Ciaran McCreesh
+ * Copyright (c) 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
@@ -70,17 +70,17 @@ namespace paludis
}
ProcessCommand::ProcessCommand(const std::initializer_list<std::string> & i) :
- Pimp<ProcessCommand>(std::vector<std::string>(i), "")
+ _imp(std::vector<std::string>(i), "")
{
}
ProcessCommand::ProcessCommand(const std::string & s) :
- Pimp<ProcessCommand>(std::vector<std::string>(), s)
+ _imp(std::vector<std::string>(), s)
{
}
ProcessCommand::ProcessCommand(ProcessCommand && other) :
- Pimp<ProcessCommand>(std::move(other._imp->args), other._imp->args_string)
+ _imp(std::move(other._imp->args), other._imp->args_string)
{
}
@@ -507,7 +507,7 @@ namespace paludis
}
Process::Process(ProcessCommand && c) :
- Pimp<Process>(std::move(c))
+ _imp(std::move(c))
{
}
@@ -965,7 +965,7 @@ namespace paludis
}
RunningProcessHandle::RunningProcessHandle(pid_t p, std::unique_ptr<RunningProcessThread> && t) :
- Pimp<RunningProcessHandle>(p, std::move(t))
+ _imp(p, std::move(t))
{
}
@@ -979,7 +979,7 @@ RunningProcessHandle::~RunningProcessHandle()
}
RunningProcessHandle::RunningProcessHandle(RunningProcessHandle && other) :
- Pimp<RunningProcessHandle>(other._imp->pid, std::move(other._imp->thread))
+ _imp(other._imp->pid, std::move(other._imp->thread))
{
_imp->pid = -1;
}