aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-19 23:19:55 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-19 23:19:55 +0000
commit364172a60127620b8b9feeef3f071ad87d496a41 (patch)
treec2b582940156a18ac4cf63cc1d985f5eebcd0ee0
parent3dca9e2c075c8aac9b1d883d7d9e3a9692af1ba9 (diff)
downloadpaludis-364172a60127620b8b9feeef3f071ad87d496a41.tar.gz
paludis-364172a60127620b8b9feeef3f071ad87d496a41.tar.xz
More legacy
-rw-r--r--paludis/args/legacy/dep_list_args_group.cc2
-rw-r--r--paludis/files.m41
-rw-r--r--paludis/legacy/Makefile.am2
-rw-r--r--paludis/legacy/dep_list_TEST.cc2
-rw-r--r--paludis/legacy/override_functions.cc (renamed from paludis/override_functions.cc)2
-rw-r--r--paludis/legacy/override_functions.hh (renamed from paludis/override_functions.hh)0
-rw-r--r--ruby/dep_list.cc2
-rw-r--r--src/clients/adjutrix/what_needs_keywording.cc2
8 files changed, 7 insertions, 6 deletions
diff --git a/paludis/args/legacy/dep_list_args_group.cc b/paludis/args/legacy/dep_list_args_group.cc
index 1bc0a2a..45920d1 100644
--- a/paludis/args/legacy/dep_list_args_group.cc
+++ b/paludis/args/legacy/dep_list_args_group.cc
@@ -25,7 +25,7 @@
#include <paludis/args/do_help.hh>
#include <paludis/environment-fwd.hh>
-#include <paludis/override_functions.hh>
+#include <paludis/legacy/override_functions.hh>
using namespace paludis;
using namespace paludis::args;
diff --git a/paludis/files.m4 b/paludis/files.m4
index e2b809a..e2c857d 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -73,7 +73,6 @@ add(`notifier_callback', `hh', `cc', `fwd')
add(`output_manager', `hh', `fwd', `cc', `se')
add(`output_manager_factory', `hh', `fwd', `cc')
add(`output_manager_from_environment', `hh', `fwd', `cc')
-add(`override_functions', `hh', `cc')
add(`package_database', `hh', `cc', `fwd', `test')
add(`package_dep_spec_collection', `hh', `cc', `fwd')
add(`package_dep_spec_properties', `hh', `cc', `fwd')
diff --git a/paludis/legacy/Makefile.am b/paludis/legacy/Makefile.am
index 9ad81d2..c6485b6 100644
--- a/paludis/legacy/Makefile.am
+++ b/paludis/legacy/Makefile.am
@@ -26,6 +26,7 @@ paludis_legacy_include_HEADERS = \
find_unused_packages_task.hh \
handled_information.hh handled_information-fwd.hh \
install_task.hh install_task-se.hh \
+ override_functions.hh \
query_visitor.hh \
range_rewriter.hh \
report_task.hh \
@@ -42,6 +43,7 @@ libpaludislegacy_@PALUDIS_PC_SLOT@_la_SOURCES = \
find_unused_packages_task.cc \
handled_information.cc \
install_task.cc \
+ override_functions.cc \
query_visitor.cc \
range_rewriter.cc \
report_task.cc \
diff --git a/paludis/legacy/dep_list_TEST.cc b/paludis/legacy/dep_list_TEST.cc
index 487f16f..8ea8599 100644
--- a/paludis/legacy/dep_list_TEST.cc
+++ b/paludis/legacy/dep_list_TEST.cc
@@ -23,7 +23,7 @@
#include <paludis/mask.hh>
#include <paludis/stringify_formatter-impl.hh>
#include <paludis/repositories/fake/fake_package_id.hh>
-#include <paludis/override_functions.hh>
+#include <paludis/legacy/override_functions.hh>
#include <paludis/repositories/e/dep_spec_pretty_printer.hh>
#include <paludis/choice.hh>
diff --git a/paludis/override_functions.cc b/paludis/legacy/override_functions.cc
index 57b227f..f9dc07e 100644
--- a/paludis/override_functions.cc
+++ b/paludis/legacy/override_functions.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/override_functions.hh>
+#include <paludis/legacy/override_functions.hh>
#include <paludis/util/simple_visitor_cast.hh>
#include <paludis/util/set.hh>
#include <paludis/util/stringify.hh>
diff --git a/paludis/override_functions.hh b/paludis/legacy/override_functions.hh
index ef21b2f..ef21b2f 100644
--- a/paludis/override_functions.hh
+++ b/paludis/legacy/override_functions.hh
diff --git a/ruby/dep_list.cc b/ruby/dep_list.cc
index d57ab36..5b945b1 100644
--- a/ruby/dep_list.cc
+++ b/ruby/dep_list.cc
@@ -23,7 +23,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
-#include <paludis/override_functions.hh>
+#include <paludis/legacy/override_functions.hh>
#include <ruby.h>
using namespace paludis;
diff --git a/src/clients/adjutrix/what_needs_keywording.cc b/src/clients/adjutrix/what_needs_keywording.cc
index 7ecb9ff..d6329f2 100644
--- a/src/clients/adjutrix/what_needs_keywording.cc
+++ b/src/clients/adjutrix/what_needs_keywording.cc
@@ -31,7 +31,7 @@
#include <paludis/repositories/fake/fake_installed_repository.hh>
#include <paludis/legacy/dep_list_exceptions.hh>
#include <paludis/legacy/dep_list.hh>
-#include <paludis/override_functions.hh>
+#include <paludis/legacy/override_functions.hh>
#include <paludis/package_id.hh>
#include <paludis/metadata_key.hh>
#include <paludis/mask.hh>