aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-03-12 15:37:57 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-03-12 15:37:57 +0000
commit5dfaae53b3b5fe95dd1d2c6f2073c036103095ce (patch)
treebab49cef8eeea3e027854958de3f5d7b644b9a9e
parent06831d88a5190f124dd69ae15012e6c8c5671567 (diff)
downloadpaludis-5dfaae53b3b5fe95dd1d2c6f2073c036103095ce.tar.gz
paludis-5dfaae53b3b5fe95dd1d2c6f2073c036103095ce.tar.xz
Move match_sequence into util
-rw-r--r--paludis/files.m41
-rw-r--r--paludis/qa/defaults_check.cc2
-rw-r--r--paludis/util/files.m41
-rw-r--r--paludis/util/match_sequence.cc (renamed from paludis/match_sequence.cc)2
-rw-r--r--paludis/util/match_sequence.hh (renamed from paludis/match_sequence.hh)0
-rw-r--r--paludis/util/match_sequence_TEST.cc (renamed from paludis/match_sequence_TEST.cc)2
6 files changed, 4 insertions, 4 deletions
diff --git a/paludis/files.m4 b/paludis/files.m4
index c383e39..0aa1c87 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -24,7 +24,6 @@ add(`fake_repository', `hh', `cc')
add(`hashed_containers', `hh', `cc', `test')
add(`mask_reasons', `hh', `cc')
add(`match_package', `hh', `cc')
-add(`match_sequence', `hh', `cc', `test')
add(`name', `hh', `cc', `test')
add(`package_database', `hh', `cc', `test')
add(`paludis', `hh', `cc')
diff --git a/paludis/qa/defaults_check.cc b/paludis/qa/defaults_check.cc
index b359b34..bc50aca 100644
--- a/paludis/qa/defaults_check.cc
+++ b/paludis/qa/defaults_check.cc
@@ -18,9 +18,9 @@
*/
#include <fstream>
-#include <paludis/match_sequence.hh>
#include <paludis/qa/defaults_check.hh>
#include <paludis/util/is_file_with_extension.hh>
+#include <paludis/util/match_sequence.hh>
using namespace paludis;
using namespace paludis::qa;
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index eb2e147..4521b9c 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/files.m4
@@ -25,6 +25,7 @@ add(`is_const', `hh', `cc', `test')
add(`is_file_with_extension', `hh', `cc', `test', `testscript')
add(`join', `hh', `cc', `test')
add(`log', `hh', `cc', `test')
+add(`match_sequence', `hh', `cc', `test')
add(`private_implementation_pattern', `hh', `cc')
add(`pstream', `hh', `cc', `test')
add(`save', `hh', `cc', `test')
diff --git a/paludis/match_sequence.cc b/paludis/util/match_sequence.cc
index d416cab..6462db2 100644
--- a/paludis/match_sequence.cc
+++ b/paludis/util/match_sequence.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/match_sequence.hh>
+#include <paludis/util/match_sequence.hh>
using namespace paludis;
diff --git a/paludis/match_sequence.hh b/paludis/util/match_sequence.hh
index df2bd67..df2bd67 100644
--- a/paludis/match_sequence.hh
+++ b/paludis/util/match_sequence.hh
diff --git a/paludis/match_sequence_TEST.cc b/paludis/util/match_sequence_TEST.cc
index a20bd15..ec33835 100644
--- a/paludis/match_sequence_TEST.cc
+++ b/paludis/util/match_sequence_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/match_sequence.hh>
+#include <paludis/util/match_sequence.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>