From fa85f0fc32b105bef5948585a7d7a38c2910854b Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 13 Oct 2014 13:12:33 +0100 Subject: Refactor regex uses, do not reference boost except in regex.hh --- src/shell_manager.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/shell_manager.cc') diff --git a/src/shell_manager.cc b/src/shell_manager.cc index 08c34160..e105f102 100644 --- a/src/shell_manager.cc +++ b/src/shell_manager.cc @@ -87,8 +87,8 @@ String ShellManager::pipe(StringView input, dup2(error_pipe[1], 2); close(error_pipe[1]); dup2(write_pipe[0], 0); close(write_pipe[0]); - boost::regex_iterator it(cmdline.begin(), cmdline.end(), env_var_regex); - boost::regex_iterator end; + RegexIterator it(cmdline.begin(), cmdline.end(), env_var_regex); + RegexIterator end; while (it != end) { @@ -145,8 +145,7 @@ String ShellManager::get_val(StringView name, const Context& context) const auto env_var = std::find_if( m_env_vars.begin(), m_env_vars.end(), [&](const std::pair& pair) - { return boost::regex_match(name.begin(), name.end(), - pair.first); }); + { return regex_match(name.begin(), name.end(), pair.first); }); if (env_var == m_env_vars.end()) throw runtime_error("no such env var: " + name); -- cgit v1.2.3