diff options
| author | Luboš Doležel <lubos@dolezel.info> | 2015-07-04 22:11:12 +0200 |
|---|---|---|
| committer | Luboš Doležel <lubos@dolezel.info> | 2015-07-04 22:11:12 +0200 |
| commit | 4ec69237e6b777df818bc95bd46a58448340b30d (patch) | |
| tree | c08584cb8cd034d071f476372ceb6de44447fa6c /src/user.cpp | |
| parent | 636331cbf0e0d0947f5d25771c5a0689f07564fd (diff) | |
| download | twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.tar twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.tar.gz twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.tar.lz twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.tar.xz twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.zip | |
Replaced Boost regex dependency with C++11 regex
Diffstat (limited to 'src/user.cpp')
| -rw-r--r-- | src/user.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/user.cpp b/src/user.cpp index a6a2a95..206cf7e 100644 --- a/src/user.cpp +++ b/src/user.cpp @@ -309,7 +309,7 @@ bool t_user::parse_num_conversion(const string &value, t_number_conversion &c) { try { c.re.assign(l[0]); c.fmt = l[1]; - } catch (boost::bad_expression) { + } catch (std::regex_error) { // Invalid regular expression log_file->write_header("t_user::parse_num_conversion", LOG_NORMAL, LOG_WARNING); @@ -2832,7 +2832,7 @@ bool t_user::write_config(const string &filename, string &error_msg) { i != number_conversions.end(); i++) { config << FLD_NUMBER_CONVERSION << '='; - config << escape(i->re.str(), ','); + config << escape(i->re, ','); config << ','; config << escape(i->fmt, ','); config << endl; @@ -3101,10 +3101,10 @@ string t_user::convert_number(const string &number, const list<t_number_conversi for (list<t_number_conversion>::const_iterator i = l.begin(); i != l.end(); i++) { - boost::smatch m; + std::smatch m; try { - if (boost::regex_match(number, m, i->re)) { + if (std::regex_match(number, m, std::regex(i->re))) { string result = m.format(i->fmt); log_file->write_header("t_user::convert_number", |