aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/e_choices_key.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-09 21:14:17 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-06-09 21:14:17 +0100
commit5dbb7636dd880314d5b03379ebfd960b469ee6e9 (patch)
tree6a9a062efbf6aa03dcbdc92b6abf156108904ea2 /paludis/repositories/e/e_choices_key.cc
parentc9137efc3ef08b5c52f775dd853c1c675e80cc64 (diff)
downloadpaludis-5dbb7636dd880314d5b03379ebfd960b469ee6e9.tar.gz
paludis-5dbb7636dd880314d5b03379ebfd960b469ee6e9.tar.xz
Replace Validated with WrappedValue
Slightly cleaner code, and will allow us to pass in additional validation options.
Diffstat (limited to 'paludis/repositories/e/e_choices_key.cc')
-rw-r--r--paludis/repositories/e/e_choices_key.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc
index 1135ce3c3..54dc236ac 100644
--- a/paludis/repositories/e/e_choices_key.cc
+++ b/paludis/repositories/e/e_choices_key.cc
@@ -119,7 +119,7 @@ namespace
std::string lower_s;
std::transform(s.begin(), s.end(), std::back_inserter(lower_s), &::tolower);
lower_s.append(delim);
- return (0 == flag.data().compare(0, lower_s.length(), lower_s, 0, lower_s.length()));
+ return (0 == flag.value().compare(0, lower_s.length(), lower_s, 0, lower_s.length()));
}
};
@@ -540,7 +540,7 @@ EChoicesKey::populate_iuse() const
for (std::map<ChoiceNameWithPrefix, ChoiceOptions>::const_iterator i(i_values.begin()), i_end(i_values.end()) ;
i != i_end ; ++i)
if (IsExpand(i->first, delim)(*u))
- values.insert(UnprefixedChoiceName(i->first.data().substr(u->length() + delim.length())));
+ values.insert(UnprefixedChoiceName(i->first.value().substr(u->length() + delim.length())));
for (std::set<UnprefixedChoiceName>::const_iterator v(values.begin()), v_end(values.end()) ;
v != v_end ; ++v)