aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/unpackaged
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/unpackaged')
-rw-r--r--paludis/repositories/unpackaged/dep_parser.cc2
-rw-r--r--paludis/repositories/unpackaged/ndbam.cc2
-rw-r--r--paludis/repositories/unpackaged/ndbam_merger.cc6
-rw-r--r--paludis/repositories/unpackaged/ndbam_unmerger.cc6
4 files changed, 6 insertions, 10 deletions
diff --git a/paludis/repositories/unpackaged/dep_parser.cc b/paludis/repositories/unpackaged/dep_parser.cc
index b5fe2b392..8416d29a5 100644
--- a/paludis/repositories/unpackaged/dep_parser.cc
+++ b/paludis/repositories/unpackaged/dep_parser.cc
@@ -36,7 +36,7 @@ DepParser::parse(const std::string & s)
new ConstTreeSequence<DependencySpecTree, AllDepSpec>(tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
std::list<std::string> tokens;
- Tokeniser<delim_kind::AnyOfTag>::tokenise(s, ",", std::back_inserter(tokens));
+ tokenise<delim_kind::AnyOfTag, delim_mode::BoundaryTag>(s, ",", "", std::back_inserter(tokens));
for (std::list<std::string>::const_iterator t(tokens.begin()), t_end(tokens.end()) ;
t != t_end ; ++t)
diff --git a/paludis/repositories/unpackaged/ndbam.cc b/paludis/repositories/unpackaged/ndbam.cc
index 027642262..2a2a73862 100644
--- a/paludis/repositories/unpackaged/ndbam.cc
+++ b/paludis/repositories/unpackaged/ndbam.cc
@@ -299,7 +299,7 @@ NDBAM::entries(const QualifiedPackageName & q)
try
{
std::vector<std::string> tokens;
- Tokeniser<delim_kind::AnyOfTag>::tokenise(d->basename(), ":", std::back_inserter(tokens));
+ tokenise<delim_kind::AnyOfTag, delim_mode::DelimiterTag>(d->basename(), ":", "", std::back_inserter(tokens));
if (tokens.size() < 3)
{
Log::get_instance()->message(ll_warning, lc_context) << "Not using '" << *d <<
diff --git a/paludis/repositories/unpackaged/ndbam_merger.cc b/paludis/repositories/unpackaged/ndbam_merger.cc
index 5674094d5..d0a2ac3e0 100644
--- a/paludis/repositories/unpackaged/ndbam_merger.cc
+++ b/paludis/repositories/unpackaged/ndbam_merger.cc
@@ -58,10 +58,8 @@ namespace paludis
options(o),
realroot(options.root.realpath())
{
- WhitespaceTokeniser::tokenise(o.config_protect,
- std::back_inserter(config_protect));
- WhitespaceTokeniser::tokenise(o.config_protect_mask,
- std::back_inserter(config_protect_mask));
+ tokenise_whitespace(o.config_protect, std::back_inserter(config_protect));
+ tokenise_whitespace(o.config_protect_mask, std::back_inserter(config_protect_mask));
}
};
}
diff --git a/paludis/repositories/unpackaged/ndbam_unmerger.cc b/paludis/repositories/unpackaged/ndbam_unmerger.cc
index 80f598260..5f495160f 100644
--- a/paludis/repositories/unpackaged/ndbam_unmerger.cc
+++ b/paludis/repositories/unpackaged/ndbam_unmerger.cc
@@ -62,10 +62,8 @@ namespace paludis
Implementation(const NDBAMUnmergerOptions & o) :
options(o)
{
- WhitespaceTokeniser::tokenise(o.config_protect,
- std::back_inserter(config_protect));
- WhitespaceTokeniser::tokenise(o.config_protect_mask,
- std::back_inserter(config_protect_mask));
+ tokenise_whitespace(o.config_protect, std::back_inserter(config_protect));
+ tokenise_whitespace(o.config_protect_mask, std::back_inserter(config_protect_mask));
}
};
}