aboutsummaryrefslogtreecommitdiff
path: root/paludis/ipc_output_manager.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 10:11:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:54:57 +0100
commit7a8a792ae878e2b432e0c67a813022117faa4e60 (patch)
treed9eac8e45ccc206bc6920d14e25f5613b54be02f /paludis/ipc_output_manager.hh
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/ipc_output_manager.hh')
-rw-r--r--paludis/ipc_output_manager.hh16
1 files changed, 8 insertions, 8 deletions
diff --git a/paludis/ipc_output_manager.hh b/paludis/ipc_output_manager.hh
index 5bff6240a..25a48e11d 100644
--- a/paludis/ipc_output_manager.hh
+++ b/paludis/ipc_output_manager.hh
@@ -28,8 +28,8 @@
#include <paludis/create_output_manager_info-fwd.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/action-fwd.hh>
-#include <tr1/memory>
-#include <tr1/functional>
+#include <memory>
+#include <functional>
#include <string>
namespace paludis
@@ -65,11 +65,11 @@ namespace paludis
public:
IPCInputManager(
const Environment * const,
- const std::tr1::function<void (const std::tr1::shared_ptr<OutputManager> &)> &);
+ const std::function<void (const std::shared_ptr<OutputManager> &)> &);
~IPCInputManager();
- const std::tr1::function<std::string (const std::string &)> pipe_command_handler()
+ const std::function<std::string (const std::string &)> pipe_command_handler()
PALUDIS_ATTRIBUTE((warn_unused_result));
/**
@@ -83,7 +83,7 @@ namespace paludis
* this method returns around for longer will also work, if, for
* example, any 'finished' messages are to be displayed later on.
*/
- const std::tr1::shared_ptr<OutputManager> underlying_output_manager_if_constructed() const
+ const std::shared_ptr<OutputManager> underlying_output_manager_if_constructed() const
PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -93,16 +93,16 @@ namespace paludis
public:
OutputManagerFromIPC(
const Environment * const,
- const std::tr1::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const PackageID> &,
const OutputExclusivity,
const ClientOutputFeatures &
);
~OutputManagerFromIPC();
- const std::tr1::shared_ptr<OutputManager> operator() (const Action &);
+ const std::shared_ptr<OutputManager> operator() (const Action &);
- const std::tr1::shared_ptr<OutputManager> output_manager_if_constructed();
+ const std::shared_ptr<OutputManager> output_manager_if_constructed();
void construct_standard_if_unconstructed();
};