aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/accounts
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/accounts')
-rw-r--r--paludis/repositories/accounts/accounts_handler.cc4
-rw-r--r--paludis/repositories/accounts/accounts_id.cc6
-rw-r--r--paludis/repositories/accounts/accounts_repository_store.cc4
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.cc2
-rw-r--r--paludis/repositories/accounts/passwd_accounts_handler.cc22
5 files changed, 19 insertions, 19 deletions
diff --git a/paludis/repositories/accounts/accounts_handler.cc b/paludis/repositories/accounts/accounts_handler.cc
index 720690786..fd28a8e00 100644
--- a/paludis/repositories/accounts/accounts_handler.cc
+++ b/paludis/repositories/accounts/accounts_handler.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009 Ciaran McCreesh
+ * Copyright (c) 2009, 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
@@ -18,7 +18,7 @@
*/
#include <paludis/repositories/accounts/accounts_handler.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/action.hh>
using namespace paludis;
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index fd0d66a0a..1b196e42a 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -25,7 +25,7 @@
#include <paludis/util/options.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/hashes.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/make_named_values.hh>
@@ -464,7 +464,7 @@ AccountsID::extra_hash_value() const
bool
AccountsID::supports_action(const SupportsActionTestBase & test) const
{
- return simple_visitor_cast<const SupportsActionTest<InstallAction> >(test);
+ return visitor_cast<const SupportsActionTest<InstallAction> >(test);
}
namespace
@@ -490,7 +490,7 @@ AccountsID::perform_action(Action & action) const
{
Timestamp build_start_time(Timestamp::now());
- const InstallAction * const install_action(simple_visitor_cast<const InstallAction>(action));
+ const InstallAction * const install_action(visitor_cast<const InstallAction>(action));
if (! install_action)
throw ActionFailedError("Unsupported action: " + action.simple_name());
diff --git a/paludis/repositories/accounts/accounts_repository_store.cc b/paludis/repositories/accounts/accounts_repository_store.cc
index e32d3d32e..fb782e316 100644
--- a/paludis/repositories/accounts/accounts_repository_store.cc
+++ b/paludis/repositories/accounts/accounts_repository_store.cc
@@ -28,7 +28,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/log.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/fs_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
#include <paludis/util/options.hh>
@@ -115,7 +115,7 @@ AccountsRepositoryStore::_load(const RepositoryName & repository_name)
continue;
}
- const MetadataValueKey<FSPath> * k(simple_visitor_cast<const MetadataValueKey<FSPath> >(**k_iter));
+ const MetadataValueKey<FSPath> * k(visitor_cast<const MetadataValueKey<FSPath> >(**k_iter));
if (! k)
{
Log::get_instance()->message("accounts.bad_key_from_repository", ll_warning, lc_context) <<
diff --git a/paludis/repositories/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index d58fc8484..24fe801c0 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -24,7 +24,7 @@
#include <paludis/util/options.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/hashes.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/mutex.hh>
diff --git a/paludis/repositories/accounts/passwd_accounts_handler.cc b/paludis/repositories/accounts/passwd_accounts_handler.cc
index 59deeced3..bac2cb24b 100644
--- a/paludis/repositories/accounts/passwd_accounts_handler.cc
+++ b/paludis/repositories/accounts/passwd_accounts_handler.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 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
@@ -20,7 +20,7 @@
#include <paludis/repositories/accounts/passwd_accounts_handler.hh>
#include <paludis/util/system.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/set.hh>
#include <paludis/util/destringify.hh>
#include <paludis/util/join.hh>
@@ -62,7 +62,7 @@ PasswdAccountsHandler::merge_user(const MergeParams & params)
if (params.package_id()->end_metadata() == m)
throw ActionFailedError("Key 'username' for '" + stringify(*params.package_id()) + "' does not exist");
- const MetadataValueKey<std::string> * k(simple_visitor_cast<const MetadataValueKey<std::string> >(**m));
+ const MetadataValueKey<std::string> * k(visitor_cast<const MetadataValueKey<std::string> >(**m));
if (! k)
throw ActionFailedError("Key 'username' for '" + stringify(*params.package_id()) + "' is not a string key");
@@ -79,7 +79,7 @@ PasswdAccountsHandler::merge_user(const MergeParams & params)
if (params.package_id()->end_metadata() == m)
break;
- const MetadataValueKey<std::string> * k(simple_visitor_cast<const MetadataValueKey<std::string> >(**m));
+ const MetadataValueKey<std::string> * k(visitor_cast<const MetadataValueKey<std::string> >(**m));
if (! k)
throw ActionFailedError("Key 'gecos' for '" + stringify(*params.package_id()) + "' is not a string key");
@@ -99,7 +99,7 @@ PasswdAccountsHandler::merge_user(const MergeParams & params)
if (params.package_id()->end_metadata() == m)
break;
- const MetadataValueKey<std::string> * k(simple_visitor_cast<const MetadataValueKey<std::string> >(**m));
+ const MetadataValueKey<std::string> * k(visitor_cast<const MetadataValueKey<std::string> >(**m));
if (! k)
throw ActionFailedError("Key 'preferred_uid' for '" + stringify(*params.package_id()) + "' is not a string key");
@@ -126,7 +126,7 @@ PasswdAccountsHandler::merge_user(const MergeParams & params)
if (params.package_id()->end_metadata() == m)
break;
- const MetadataValueKey<std::string> * k(simple_visitor_cast<const MetadataValueKey<std::string> >(**m));
+ const MetadataValueKey<std::string> * k(visitor_cast<const MetadataValueKey<std::string> >(**m));
if (! k)
throw ActionFailedError("Key 'primary_group' for '" + stringify(*params.package_id()) + "' is not a string key");
@@ -146,7 +146,7 @@ PasswdAccountsHandler::merge_user(const MergeParams & params)
if (params.package_id()->end_metadata() == m)
break;
- const MetadataCollectionKey<Set<std::string> > * k(simple_visitor_cast<const MetadataCollectionKey<Set<std::string> > >(**m));
+ const MetadataCollectionKey<Set<std::string> > * k(visitor_cast<const MetadataCollectionKey<Set<std::string> > >(**m));
if (! k)
throw ActionFailedError("Key 'extra_groups' for '" + stringify(*params.package_id()) + "' is not a string set key");
@@ -166,7 +166,7 @@ PasswdAccountsHandler::merge_user(const MergeParams & params)
if (params.package_id()->end_metadata() == m)
break;
- const MetadataValueKey<std::string> * k(simple_visitor_cast<const MetadataValueKey<std::string> >(**m));
+ const MetadataValueKey<std::string> * k(visitor_cast<const MetadataValueKey<std::string> >(**m));
if (! k)
throw ActionFailedError("Key 'shell' for '" + stringify(*params.package_id()) + "' is not a string key");
@@ -186,7 +186,7 @@ PasswdAccountsHandler::merge_user(const MergeParams & params)
if (params.package_id()->end_metadata() == m)
break;
- const MetadataValueKey<std::string> * k(simple_visitor_cast<const MetadataValueKey<std::string> >(**m));
+ const MetadataValueKey<std::string> * k(visitor_cast<const MetadataValueKey<std::string> >(**m));
if (! k)
throw ActionFailedError("Key 'home' for '" + stringify(*params.package_id()) + "' is not a string key");
@@ -218,7 +218,7 @@ PasswdAccountsHandler::merge_group(const MergeParams & params)
if (params.package_id()->end_metadata() == m)
throw ActionFailedError("Key 'groupname' for '" + stringify(*params.package_id()) + "' does not exist");
- const MetadataValueKey<std::string> * k(simple_visitor_cast<const MetadataValueKey<std::string> >(**m));
+ const MetadataValueKey<std::string> * k(visitor_cast<const MetadataValueKey<std::string> >(**m));
if (! k)
throw ActionFailedError("Key 'groupname' for '" + stringify(*params.package_id()) + "' is not a string key");
@@ -235,7 +235,7 @@ PasswdAccountsHandler::merge_group(const MergeParams & params)
if (params.package_id()->end_metadata() == m)
break;
- const MetadataValueKey<std::string> * k(simple_visitor_cast<const MetadataValueKey<std::string> >(**m));
+ const MetadataValueKey<std::string> * k(visitor_cast<const MetadataValueKey<std::string> >(**m));
if (! k)
throw ActionFailedError("Key 'preferred_gid' for '" + stringify(*params.package_id()) + "' is not a string key");