aboutsummaryrefslogtreecommitdiff
path: root/paludis/util
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/util')
-rw-r--r--paludis/util/elf_dynamic_section.hh2
-rw-r--r--paludis/util/elf_sections.hh2
-rw-r--r--paludis/util/files.m44
-rw-r--r--paludis/util/visitor-fwd.hh (renamed from paludis/util/simple_visitor-fwd.hh)6
-rw-r--r--paludis/util/visitor-impl.hh (renamed from paludis/util/simple_visitor-impl.hh)8
-rw-r--r--paludis/util/visitor.cc (renamed from paludis/util/simple_visitor.cc)4
-rw-r--r--paludis/util/visitor.hh (renamed from paludis/util/simple_visitor.hh)8
-rw-r--r--paludis/util/visitor_cast-fwd.hh (renamed from paludis/util/simple_visitor_cast-fwd.hh)8
-rw-r--r--paludis/util/visitor_cast.cc (renamed from paludis/util/simple_visitor_cast.cc)4
-rw-r--r--paludis/util/visitor_cast.hh (renamed from paludis/util/simple_visitor_cast.hh)24
10 files changed, 35 insertions, 35 deletions
diff --git a/paludis/util/elf_dynamic_section.hh b/paludis/util/elf_dynamic_section.hh
index 6ba87f1ef..af01f6c13 100644
--- a/paludis/util/elf_dynamic_section.hh
+++ b/paludis/util/elf_dynamic_section.hh
@@ -26,7 +26,7 @@
#include <paludis/util/singleton.hh>
#include <paludis/util/pimp.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
-#include <paludis/util/simple_visitor.hh>
+#include <paludis/util/visitor.hh>
#include <paludis/util/type_list.hh>
#include <memory>
#include <string>
diff --git a/paludis/util/elf_sections.hh b/paludis/util/elf_sections.hh
index 5095d236b..3569e81f4 100644
--- a/paludis/util/elf_sections.hh
+++ b/paludis/util/elf_sections.hh
@@ -23,7 +23,7 @@
#include <string>
#include <iosfwd>
-#include <paludis/util/simple_visitor.hh>
+#include <paludis/util/visitor.hh>
#include <paludis/util/type_list.hh>
namespace paludis
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index ea16e2b48..4f4e82382 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/files.m4
@@ -76,8 +76,6 @@ add(`set', `hh', `fwd', `impl', `cc')
add(`sha1', `hh', `cc', `test')
add(`sha256', `hh', `cc', `test')
add(`simple_parser', `hh', `cc', `test', `fwd')
-add(`simple_visitor', `hh', `cc', `fwd', `impl')
-add(`simple_visitor_cast', `hh', `cc', `fwd')
add(`singleton', `hh', `impl', `test')
add(`stringify', `hh', `test')
add(`string_list_stream', `hh', `cc', `fwd', `test')
@@ -92,6 +90,8 @@ add(`tokeniser', `hh', `cc', `test')
add(`tribool', `hh', `cc', `fwd', `test')
add(`type_list', `hh', `cc', `fwd')
add(`util', `hh')
+add(`visitor', `hh', `cc', `fwd', `impl')
+add(`visitor_cast', `hh', `cc', `fwd')
add(`wildcard_expander', `hh', `cc', `test', `testscript')
add(`wrapped_forward_iterator', `hh', `fwd', `impl', `test')
add(`wrapped_output_iterator', `hh', `fwd', `impl')
diff --git a/paludis/util/simple_visitor-fwd.hh b/paludis/util/visitor-fwd.hh
index ce75ea8d0..60313dea0 100644
--- a/paludis/util/simple_visitor-fwd.hh
+++ b/paludis/util/visitor-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 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
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_FWD_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_FWD_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_FWD_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_FWD_HH 1
#include <paludis/util/type_list-fwd.hh>
diff --git a/paludis/util/simple_visitor-impl.hh b/paludis/util/visitor-impl.hh
index 4418e3308..3d7381e46 100644
--- a/paludis/util/simple_visitor-impl.hh
+++ b/paludis/util/visitor-impl.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 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
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_IMPL_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_IMPL_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_IMPL_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_IMPL_HH 1
-#include <paludis/util/simple_visitor.hh>
+#include <paludis/util/visitor.hh>
namespace paludis
{
diff --git a/paludis/util/simple_visitor.cc b/paludis/util/visitor.cc
index 0c845767c..c990a75f5 100644
--- a/paludis/util/simple_visitor.cc
+++ b/paludis/util/visitor.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 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
@@ -17,5 +17,5 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/simple_visitor-impl.hh>
+#include <paludis/util/visitor-impl.hh>
diff --git a/paludis/util/simple_visitor.hh b/paludis/util/visitor.hh
index 8c3877e6b..b88ae4f8f 100644
--- a/paludis/util/simple_visitor.hh
+++ b/paludis/util/visitor.hh
@@ -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
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_HH 1
-#include <paludis/util/simple_visitor-fwd.hh>
+#include <paludis/util/visitor-fwd.hh>
#include <paludis/util/no_type.hh>
namespace paludis
diff --git a/paludis/util/simple_visitor_cast-fwd.hh b/paludis/util/visitor_cast-fwd.hh
index 7482c9bde..5fdfa2919 100644
--- a/paludis/util/simple_visitor_cast-fwd.hh
+++ b/paludis/util/visitor_cast-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2008, 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
@@ -17,15 +17,15 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_CAST_FWD_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_CAST_FWD_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_CAST_FWD_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_CAST_FWD_HH 1
#include <paludis/util/attributes.hh>
namespace paludis
{
template <typename To_, typename From_>
- To_ * simple_visitor_cast(From_ &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ To_ * visitor_cast(From_ &) PALUDIS_ATTRIBUTE((warn_unused_result));
}
#endif
diff --git a/paludis/util/simple_visitor_cast.cc b/paludis/util/visitor_cast.cc
index 641abf82a..320bbca9d 100644
--- a/paludis/util/simple_visitor_cast.cc
+++ b/paludis/util/visitor_cast.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 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
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/util/simple_visitor_cast.hh>
+#include <paludis/util/visitor_cast.hh>
using namespace paludis;
diff --git a/paludis/util/simple_visitor_cast.hh b/paludis/util/visitor_cast.hh
index 9b1370be6..568de2d8b 100644
--- a/paludis/util/simple_visitor_cast.hh
+++ b/paludis/util/visitor_cast.hh
@@ -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
@@ -17,17 +17,17 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_CAST_HH
-#define PALUDIS_GUARD_PALUDIS_UTIL_SIMPLE_VISITOR_CAST_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_CAST_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_VISITOR_CAST_HH 1
-#include <paludis/util/simple_visitor_cast-fwd.hh>
-#include <paludis/util/simple_visitor.hh>
+#include <paludis/util/visitor_cast-fwd.hh>
+#include <paludis/util/visitor.hh>
#include <type_traits>
namespace paludis
{
template <typename To_, typename From_>
- struct SimpleVisitorCaster
+ struct VisitorCaster
{
To_ * visit(To_ & t)
{
@@ -41,12 +41,12 @@ namespace paludis
};
template <typename To_, typename From_, bool ok_>
- struct VerifySimpleVisitorCastType
+ struct VerifyVisitorCastType
{
};
template <typename To_, typename From_>
- struct VerifySimpleVisitorCastType<To_, From_, true>
+ struct VerifyVisitorCastType<To_, From_, true>
{
typedef int IsOK;
};
@@ -64,13 +64,13 @@ namespace paludis
};
template <typename To_, typename From_>
- To_ * simple_visitor_cast(From_ & from)
+ To_ * visitor_cast(From_ & from)
{
- /* verify that we are attempting to simple_visitor_cast something that
+ /* verify that we are attempting to visitor_cast something that
* could potentially be true */
- typedef typename VerifySimpleVisitorCastType<To_, From_, std::is_base_of<From_, To_>::value>::IsOK TypeIsOK;
+ typedef typename VerifyVisitorCastType<To_, From_, std::is_base_of<From_, To_>::value>::IsOK TypeIsOK;
- SimpleVisitorCaster<To_, typename CopyConst<From_, typename From_::VisitableBaseClass>::Type> q;
+ VisitorCaster<To_, typename CopyConst<From_, typename From_::VisitableBaseClass>::Type> q;
return from.template accept_returning<To_ *>(q);
}
}