aboutsummaryrefslogtreecommitdiff
path: root/src/clients/cave
diff options
context:
space:
mode:
Diffstat (limited to 'src/clients/cave')
-rw-r--r--src/clients/cave/cmd_digest.cc2
-rwxr-xr-xsrc/clients/cave/cmd_display_resolution.cc2
-rw-r--r--src/clients/cave/cmd_execute_resolution.cc14
-rw-r--r--src/clients/cave/cmd_find_candidates.cc2
-rw-r--r--src/clients/cave/cmd_generate_metadata.cc2
-rw-r--r--src/clients/cave/cmd_has_version.cc2
-rw-r--r--src/clients/cave/cmd_info.cc6
-rw-r--r--src/clients/cave/cmd_manage_search_index.cc4
-rw-r--r--src/clients/cave/cmd_match.cc2
-rw-r--r--src/clients/cave/cmd_mirror.cc2
-rw-r--r--src/clients/cave/cmd_print_best_version.cc2
-rw-r--r--src/clients/cave/cmd_print_environment_metadata.cc6
-rw-r--r--src/clients/cave/cmd_print_id_masks.cc2
-rw-r--r--src/clients/cave/cmd_print_id_metadata.cc4
-rw-r--r--src/clients/cave/cmd_print_ids.cc12
-rw-r--r--src/clients/cave/cmd_print_repository_metadata.cc6
-rw-r--r--src/clients/cave/cmd_print_set.cc4
-rw-r--r--src/clients/cave/cmd_print_spec.cc4
-rw-r--r--src/clients/cave/cmd_print_unused_distfiles.cc6
-rw-r--r--src/clients/cave/cmd_report.cc2
-rw-r--r--src/clients/cave/cmd_show.cc6
-rw-r--r--src/clients/cave/cmd_verify.cc6
-rw-r--r--src/clients/cave/resolve_common.cc6
23 files changed, 52 insertions, 52 deletions
diff --git a/src/clients/cave/cmd_digest.cc b/src/clients/cave/cmd_digest.cc
index aadfe2fca..bfa0ac910 100644
--- a/src/clients/cave/cmd_digest.cc
+++ b/src/clients/cave/cmd_digest.cc
@@ -26,7 +26,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/map.hh>
#include <paludis/util/make_named_values.hh>
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index b5a60f516..2a60e5b8f 100755
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -37,7 +37,7 @@
#include <paludis/util/make_named_values.hh>
#include <paludis/util/make_shared_copy.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/log.hh>
#include <paludis/util/pretty_print.hh>
#include <paludis/util/make_null_shared_ptr.hh>
diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
index 49e08fa18..49b5a4bcf 100644
--- a/src/clients/cave/cmd_execute_resolution.cc
+++ b/src/clients/cave/cmd_execute_resolution.cc
@@ -35,8 +35,8 @@
#include <paludis/util/join.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/options.hh>
-#include <paludis/util/simple_visitor_cast.hh>
-#include <paludis/util/simple_visitor-impl.hh>
+#include <paludis/util/visitor_cast.hh>
+#include <paludis/util/visitor-impl.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/make_shared_copy.hh>
#include <paludis/util/hashes.hh>
@@ -169,7 +169,7 @@ namespace
{
bool operator() (const std::shared_ptr<const ExecuteJob> & job) const
{
- return (! job->state()) || ! simple_visitor_cast<const JobSucceededState>(*job->state());
+ return (! job->state()) || ! visitor_cast<const JobSucceededState>(*job->state());
}
};
@@ -1307,7 +1307,7 @@ namespace
std::string queue_name() const
{
if (0 != n_fetch_jobs)
- return simple_visitor_cast<const FetchJob>(*job) ? "fetch" : "execute";
+ return visitor_cast<const FetchJob>(*job) ? "fetch" : "execute";
else
return "execute";
}
@@ -1364,7 +1364,7 @@ namespace
}
if (want && cmdline.execution_options.a_fetch.specified())
- want = simple_visitor_cast<const FetchJob>(*job);
+ want = visitor_cast<const FetchJob>(*job);
int current_global_retcode;
{
@@ -1687,7 +1687,7 @@ namespace
void visit(const JobSucceededState & s) const
{
if ((s.output_manager() && s.output_manager()->want_to_flush())
- || (something_failed && ! simple_visitor_cast<const FetchJob>(*job)))
+ || (something_failed && ! visitor_cast<const FetchJob>(*job)))
{
need_heading();
cout << fuc(fs_summary_job_succeeded(), fv<'s'>(job->accept_returning<std::string>(SummaryNameVisitor(env))));
@@ -1702,7 +1702,7 @@ namespace
void visit(const JobSkippedState &) const
{
- if (! simple_visitor_cast<const FetchJob>(*job))
+ if (! visitor_cast<const FetchJob>(*job))
{
need_heading();
cout << fuc(fs_summary_job_skipped(), fv<'s'>(job->accept_returning<std::string>(SummaryNameVisitor(env))));
diff --git a/src/clients/cave/cmd_find_candidates.cc b/src/clients/cave/cmd_find_candidates.cc
index e5e0057ac..1cd4a1729 100644
--- a/src/clients/cave/cmd_find_candidates.cc
+++ b/src/clients/cave/cmd_find_candidates.cc
@@ -42,7 +42,7 @@
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/make_shared_copy.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <cstdlib>
diff --git a/src/clients/cave/cmd_generate_metadata.cc b/src/clients/cave/cmd_generate_metadata.cc
index 31d1cf561..5e64242eb 100644
--- a/src/clients/cave/cmd_generate_metadata.cc
+++ b/src/clients/cave/cmd_generate_metadata.cc
@@ -28,7 +28,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/accept_visitor.hh>
#include <paludis/util/thread_pool.hh>
diff --git a/src/clients/cave/cmd_has_version.cc b/src/clients/cave/cmd_has_version.cc
index b96bed002..af906895e 100644
--- a/src/clients/cave/cmd_has_version.cc
+++ b/src/clients/cave/cmd_has_version.cc
@@ -27,7 +27,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/map.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/generator.hh>
diff --git a/src/clients/cave/cmd_info.cc b/src/clients/cave/cmd_info.cc
index 09261bd18..a106add3d 100644
--- a/src/clients/cave/cmd_info.cc
+++ b/src/clients/cave/cmd_info.cc
@@ -40,7 +40,7 @@
#include <paludis/metadata_key.hh>
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/pretty_print.hh>
#include <paludis/util/timestamp.hh>
#include <paludis/util/make_null_shared_ptr.hh>
@@ -92,8 +92,8 @@ namespace
{
bool operator() (const std::shared_ptr<const MetadataKey> & a, const std::shared_ptr<const MetadataKey> & b) const
{
- bool a_is_section(simple_visitor_cast<const MetadataSectionKey>(*a));
- bool b_is_section(simple_visitor_cast<const MetadataSectionKey>(*b));
+ bool a_is_section(visitor_cast<const MetadataSectionKey>(*a));
+ bool b_is_section(visitor_cast<const MetadataSectionKey>(*b));
if (a_is_section != b_is_section)
return b_is_section;
if (a->type() != b->type())
diff --git a/src/clients/cave/cmd_manage_search_index.cc b/src/clients/cave/cmd_manage_search_index.cc
index c48544807..e95aea22d 100644
--- a/src/clients/cave/cmd_manage_search_index.cc
+++ b/src/clients/cave/cmd_manage_search_index.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
@@ -45,7 +45,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/accept_visitor.hh>
#include <paludis/util/mutex.hh>
diff --git a/src/clients/cave/cmd_match.cc b/src/clients/cave/cmd_match.cc
index 18b18fcc7..c4e272378 100644
--- a/src/clients/cave/cmd_match.cc
+++ b/src/clients/cave/cmd_match.cc
@@ -29,7 +29,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/accept_visitor.hh>
diff --git a/src/clients/cave/cmd_mirror.cc b/src/clients/cave/cmd_mirror.cc
index 784bbe031..c945aa169 100644
--- a/src/clients/cave/cmd_mirror.cc
+++ b/src/clients/cave/cmd_mirror.cc
@@ -27,7 +27,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/map.hh>
#include <paludis/util/make_named_values.hh>
diff --git a/src/clients/cave/cmd_print_best_version.cc b/src/clients/cave/cmd_print_best_version.cc
index e39489c30..26ee18f45 100644
--- a/src/clients/cave/cmd_print_best_version.cc
+++ b/src/clients/cave/cmd_print_best_version.cc
@@ -27,7 +27,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/map.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/generator.hh>
diff --git a/src/clients/cave/cmd_print_environment_metadata.cc b/src/clients/cave/cmd_print_environment_metadata.cc
index deab36767..8c370775c 100644
--- a/src/clients/cave/cmd_print_environment_metadata.cc
+++ b/src/clients/cave/cmd_print_environment_metadata.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009, 2010 Ciaran McCreesh
+ * Copyright (c) 2008, 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
@@ -22,7 +22,7 @@
#include "exceptions.hh"
#include <paludis/args/args.hh>
#include <paludis/args/do_help.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/set.hh>
#include <paludis/environment.hh>
#include <paludis/metadata_key.hh>
@@ -101,7 +101,7 @@ namespace
cout << format_plain_metadata_key(k, name_prefix, cmdline.a_format.argument());
} while (false);
- const MetadataSectionKey * section(simple_visitor_cast<const MetadataSectionKey>(*k));
+ const MetadataSectionKey * section(visitor_cast<const MetadataSectionKey>(*k));
if (section)
{
for (MetadataSectionKey::MetadataConstIterator s(section->begin_metadata()), s_end(section->end_metadata()) ;
diff --git a/src/clients/cave/cmd_print_id_masks.cc b/src/clients/cave/cmd_print_id_masks.cc
index 9664c11d9..b81be8b91 100644
--- a/src/clients/cave/cmd_print_id_masks.cc
+++ b/src/clients/cave/cmd_print_id_masks.cc
@@ -23,7 +23,7 @@
#include "format_string.hh"
#include <paludis/args/args.hh>
#include <paludis/args/do_help.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/set.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/options.hh>
diff --git a/src/clients/cave/cmd_print_id_metadata.cc b/src/clients/cave/cmd_print_id_metadata.cc
index 960742561..2b3b78e99 100644
--- a/src/clients/cave/cmd_print_id_metadata.cc
+++ b/src/clients/cave/cmd_print_id_metadata.cc
@@ -22,7 +22,7 @@
#include "exceptions.hh"
#include <paludis/args/args.hh>
#include <paludis/args/do_help.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/set.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/options.hh>
@@ -121,7 +121,7 @@ namespace
cout << format_plain_metadata_key(k, name_prefix, cmdline.a_format.argument());
} while (false);
- const MetadataSectionKey * section(simple_visitor_cast<const MetadataSectionKey>(*k));
+ const MetadataSectionKey * section(visitor_cast<const MetadataSectionKey>(*k));
if (section)
{
for (MetadataSectionKey::MetadataConstIterator s(section->begin_metadata()), s_end(section->end_metadata()) ;
diff --git a/src/clients/cave/cmd_print_ids.cc b/src/clients/cave/cmd_print_ids.cc
index daa5d08ee..e987d8e90 100644
--- a/src/clients/cave/cmd_print_ids.cc
+++ b/src/clients/cave/cmd_print_ids.cc
@@ -28,7 +28,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/map.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/generator.hh>
@@ -182,7 +182,7 @@ namespace
{
for (PackageID::MasksConstIterator m((*i)->begin_masks()), m_end((*i)->end_masks()) ;
m != m_end ; ++m)
- if (simple_visitor_cast<const UserMask>(**m))
+ if (visitor_cast<const UserMask>(**m))
{
result->insert(*i);
break;
@@ -192,7 +192,7 @@ namespace
{
for (PackageID::MasksConstIterator m((*i)->begin_masks()), m_end((*i)->end_masks()) ;
m != m_end ; ++m)
- if (simple_visitor_cast<const UnacceptedMask>(**m))
+ if (visitor_cast<const UnacceptedMask>(**m))
{
result->insert(*i);
break;
@@ -202,7 +202,7 @@ namespace
{
for (PackageID::MasksConstIterator m((*i)->begin_masks()), m_end((*i)->end_masks()) ;
m != m_end ; ++m)
- if (simple_visitor_cast<const RepositoryMask>(**m))
+ if (visitor_cast<const RepositoryMask>(**m))
{
result->insert(*i);
break;
@@ -212,7 +212,7 @@ namespace
{
for (PackageID::MasksConstIterator m((*i)->begin_masks()), m_end((*i)->end_masks()) ;
m != m_end ; ++m)
- if (simple_visitor_cast<const UnsupportedMask>(**m))
+ if (visitor_cast<const UnsupportedMask>(**m))
{
result->insert(*i);
break;
@@ -222,7 +222,7 @@ namespace
{
for (PackageID::MasksConstIterator m((*i)->begin_masks()), m_end((*i)->end_masks()) ;
m != m_end ; ++m)
- if (simple_visitor_cast<const AssociationMask>(**m))
+ if (visitor_cast<const AssociationMask>(**m))
{
result->insert(*i);
break;
diff --git a/src/clients/cave/cmd_print_repository_metadata.cc b/src/clients/cave/cmd_print_repository_metadata.cc
index 3796ef941..2a5aa2406 100644
--- a/src/clients/cave/cmd_print_repository_metadata.cc
+++ b/src/clients/cave/cmd_print_repository_metadata.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
@@ -22,7 +22,7 @@
#include "exceptions.hh"
#include <paludis/args/args.hh>
#include <paludis/args/do_help.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/set.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/options.hh>
@@ -104,7 +104,7 @@ namespace
cout << format_plain_metadata_key(k, name_prefix, cmdline.a_format.argument());
} while (false);
- const MetadataSectionKey * section(simple_visitor_cast<const MetadataSectionKey>(*k));
+ const MetadataSectionKey * section(visitor_cast<const MetadataSectionKey>(*k));
if (section)
{
for (MetadataSectionKey::MetadataConstIterator s(section->begin_metadata()), s_end(section->end_metadata()) ;
diff --git a/src/clients/cave/cmd_print_set.cc b/src/clients/cave/cmd_print_set.cc
index 6b2bafc41..eca313196 100644
--- a/src/clients/cave/cmd_print_set.cc
+++ b/src/clients/cave/cmd_print_set.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
@@ -30,7 +30,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/map.hh>
#include <paludis/util/accept_visitor.hh>
#include <cstdlib>
diff --git a/src/clients/cave/cmd_print_spec.cc b/src/clients/cave/cmd_print_spec.cc
index 8add40388..2c7a2c43d 100644
--- a/src/clients/cave/cmd_print_spec.cc
+++ b/src/clients/cave/cmd_print_spec.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
@@ -22,7 +22,7 @@
#include "format_string.hh"
#include <paludis/args/args.hh>
#include <paludis/args/do_help.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/set.hh>
#include <paludis/util/iterator_funcs.hh>
#include <paludis/util/options.hh>
diff --git a/src/clients/cave/cmd_print_unused_distfiles.cc b/src/clients/cave/cmd_print_unused_distfiles.cc
index 6a77ea9c2..59c15522b 100644
--- a/src/clients/cave/cmd_print_unused_distfiles.cc
+++ b/src/clients/cave/cmd_print_unused_distfiles.cc
@@ -2,7 +2,7 @@
/*
* Copyright (c) 2010 Stephan Friedrichs
- * 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
@@ -40,7 +40,7 @@
#include <paludis/util/fs_iterator.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/map.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <iostream>
@@ -198,7 +198,7 @@ PrintUnusedDistfilesCommand::run(
auto distdir_metadata((*repo)->find_metadata("distdir"));
if (distdir_metadata != (*repo)->end_metadata())
{
- auto path_key(simple_visitor_cast<const MetadataValueKey<FSPath>>(**distdir_metadata));
+ auto path_key(visitor_cast<const MetadataValueKey<FSPath>>(**distdir_metadata));
if (path_key)
distdirs.insert(path_key->value().realpath());
}
diff --git a/src/clients/cave/cmd_report.cc b/src/clients/cave/cmd_report.cc
index 1a0d39911..511dabf67 100644
--- a/src/clients/cave/cmd_report.cc
+++ b/src/clients/cave/cmd_report.cc
@@ -45,7 +45,7 @@
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/make_null_shared_ptr.hh>
#include <paludis/util/accept_visitor.hh>
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index 99b71379f..47e44b513 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -40,7 +40,7 @@
#include <paludis/metadata_key.hh>
#include <paludis/util/set.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/pretty_print.hh>
#include <paludis/util/timestamp.hh>
@@ -253,8 +253,8 @@ namespace
{
bool operator() (const std::shared_ptr<const MetadataKey> & a, const std::shared_ptr<const MetadataKey> & b) const
{
- bool a_is_section(simple_visitor_cast<const MetadataSectionKey>(*a));
- bool b_is_section(simple_visitor_cast<const MetadataSectionKey>(*b));
+ bool a_is_section(visitor_cast<const MetadataSectionKey>(*a));
+ bool b_is_section(visitor_cast<const MetadataSectionKey>(*b));
if (a_is_section != b_is_section)
return b_is_section;
if (a->type() != b->type())
diff --git a/src/clients/cave/cmd_verify.cc b/src/clients/cave/cmd_verify.cc
index 87d013ffa..4d2200481 100644
--- a/src/clients/cave/cmd_verify.cc
+++ b/src/clients/cave/cmd_verify.cc
@@ -30,7 +30,7 @@
#include <paludis/util/accept_visitor.hh>
#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/util/safe_ifstream.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/md5.hh>
#include <paludis/util/fs_stat.hh>
#include <paludis/util/make_null_shared_ptr.hh>
@@ -121,7 +121,7 @@ namespace
ContentsEntry::MetadataConstIterator k(e.find_metadata("mtime"));
if (e.end_metadata() != k)
{
- const MetadataTimeKey * kk(simple_visitor_cast<const MetadataTimeKey>(**k));
+ const MetadataTimeKey * kk(visitor_cast<const MetadataTimeKey>(**k));
if (kk && (kk->value().seconds() != f.mtim().seconds()))
{
message(p, "Modification time changed");
@@ -137,7 +137,7 @@ namespace
ContentsEntry::MetadataConstIterator k(e.find_metadata("md5"));
if (e.end_metadata() != k)
{
- const MetadataValueKey<std::string> * kk(simple_visitor_cast<const MetadataValueKey<std::string> >(**k));
+ const MetadataValueKey<std::string> * kk(visitor_cast<const MetadataValueKey<std::string> >(**k));
if (kk)
{
SafeIFStream s(f);
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index 747305b1c..a42a36922 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -39,7 +39,7 @@
#include <paludis/util/timestamp.hh>
#include <paludis/util/map.hh>
#include <paludis/util/make_shared_copy.hh>
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
#include <paludis/util/sequence-impl.hh>
#include <paludis/util/set-impl.hh>
#include <paludis/util/wrapped_forward_iterator-impl.hh>
@@ -621,11 +621,11 @@ namespace
std::shared_ptr<const QualifiedPackageName> name_if_dependent_remove(
const std::shared_ptr<const Resolution> & resolution)
{
- const RemoveDecision * const remove_decision(simple_visitor_cast<const RemoveDecision>(*resolution->decision()));
+ const RemoveDecision * const remove_decision(visitor_cast<const RemoveDecision>(*resolution->decision()));
if (remove_decision)
for (auto r(resolution->constraints()->begin()), r_end(resolution->constraints()->end()) ;
r != r_end ; ++r)
- if (simple_visitor_cast<const DependentReason>(*(*r)->reason()))
+ if (visitor_cast<const DependentReason>(*(*r)->reason()))
return make_shared_copy((*remove_decision->ids()->begin())->name());
return make_null_shared_ptr();
}