aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/world.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-26 13:59:04 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-26 13:59:04 +0000
commit118de550d2dc5508ff4446bdf7f2ddf7b497b9ba (patch)
tree5ced2de062474cb8e6537e68d71cbc7c5a80e802 /paludis/environments/paludis/world.cc
parentf76a3a0a7b38b5a3652a9e9bcb13942483f7c53a (diff)
downloadpaludis-118de550d2dc5508ff4446bdf7f2ddf7b497b9ba.tar.gz
paludis-118de550d2dc5508ff4446bdf7f2ddf7b497b9ba.tar.xz
paludis::tr1:: is dead. We no longer support compilers that don't do tr1 (that means you, gcc-3).
Diffstat (limited to 'paludis/environments/paludis/world.cc')
-rw-r--r--paludis/environments/paludis/world.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc
index ed4ecb9a8..08259f49c 100644
--- a/paludis/environments/paludis/world.cc
+++ b/paludis/environments/paludis/world.cc
@@ -22,11 +22,11 @@
#include <paludis/util/fs_entry.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/tr1_functional.hh>
#include <paludis/util/log.hh>
#include <paludis/set_file.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/dep_tag.hh>
+#include <tr1/functional>
#include <fstream>
using namespace paludis;
@@ -38,10 +38,10 @@ namespace paludis
struct Implementation<World>
{
const Environment * const env;
- const tr1::shared_ptr<const FSEntry> maybe_world_file;
+ const std::tr1::shared_ptr<const FSEntry> maybe_world_file;
mutable Mutex mutex;
- Implementation(const Environment * const e, const tr1::shared_ptr<const FSEntry> & m) :
+ Implementation(const Environment * const e, const std::tr1::shared_ptr<const FSEntry> & m) :
env(e),
maybe_world_file(m)
{
@@ -49,7 +49,7 @@ namespace paludis
};
}
-World::World(const Environment * const e, const tr1::shared_ptr<const FSEntry> & f) :
+World::World(const Environment * const e, const std::tr1::shared_ptr<const FSEntry> & f) :
PrivateImplementationPattern<World>(new Implementation<World>(e, f))
{
}
@@ -85,7 +85,7 @@ World::remove_from_world(const QualifiedPackageName & q) const
void
World::_add_string_to_world(const std::string & n) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
if (! _imp->maybe_world_file)
{
@@ -114,8 +114,8 @@ World::_add_string_to_world(const std::string & n) const
SetFile world(SetFileParams::create()
.file_name(*_imp->maybe_world_file)
.type(sft_simple)
- .parser(tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
- .tag(tr1::shared_ptr<DepTag>())
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
+ .tag(std::tr1::shared_ptr<DepTag>())
.set_operator_mode(sfsmo_natural)
.environment(_imp->env));
world.add(n);
@@ -125,7 +125,7 @@ World::_add_string_to_world(const std::string & n) const
void
World::_remove_string_from_world(const std::string & n) const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
if (! _imp->maybe_world_file)
{
@@ -143,8 +143,8 @@ World::_remove_string_from_world(const std::string & n) const
SetFile world(SetFileParams::create()
.file_name(*_imp->maybe_world_file)
.type(sft_simple)
- .parser(tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
- .tag(tr1::shared_ptr<DepTag>())
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
+ .tag(std::tr1::shared_ptr<DepTag>())
.set_operator_mode(sfsmo_natural)
.environment(_imp->env));
@@ -153,12 +153,12 @@ World::_remove_string_from_world(const std::string & n) const
}
}
-tr1::shared_ptr<SetSpecTree::ConstItem>
+std::tr1::shared_ptr<SetSpecTree::ConstItem>
World::world_set() const
{
- using namespace tr1::placeholders;
+ using namespace std::tr1::placeholders;
- tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("world"), "Environment"));
+ std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("world"), "Environment"));
if (_imp->maybe_world_file)
{
@@ -167,7 +167,7 @@ World::world_set() const
SetFile world(SetFileParams::create()
.file_name(*_imp->maybe_world_file)
.type(sft_simple)
- .parser(tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
+ .parser(std::tr1::bind(&parse_user_package_dep_spec, _1, UserPackageDepSpecOptions()))
.tag(tag)
.set_operator_mode(sfsmo_natural)
.environment(_imp->env));
@@ -178,7 +178,7 @@ World::world_set() const
<< "World file '" << *_imp->maybe_world_file << "' doesn't exist";
}
- return tr1::shared_ptr<SetSpecTree::ConstItem>(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
- tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
+ return std::tr1::shared_ptr<SetSpecTree::ConstItem>(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
+ std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
}