--- a/src/smallut.cpp
+++ b/src/smallut.cpp
@@ -477,13 +477,13 @@
}
// Remove some chars and replace them with spaces
-string neutchars(const string& str, const string& chars)
+string neutchars(const string& str, const string& chars, char rep)
{
string out;
- neutchars(str, out, chars);
+ neutchars(str, out, chars, rep);
return out;
}
-void neutchars(const string& str, string& out, const string& chars)
+void neutchars(const string& str, string& out, const string& chars, char rep)
{
string::size_type startPos, pos;
@@ -498,7 +498,7 @@
if (pos == string::npos) {
out += str.substr(startPos);
} else {
- out += str.substr(startPos, pos - startPos) + " ";
+ out += str.substr(startPos, pos - startPos) + rep;
}
}
}
@@ -1237,9 +1237,10 @@
public:
Internal(const string& exp, int flags, int nm)
: expr(exp,
- basic_regex<char>::flag_type(regex_constants::extended |
- ((flags&SRE_ICASE) ? regex_constants::icase : 0) |
- ((flags&SRE_NOSUB) ? regex_constants::nosubs : 0)
+ basic_regex<char>::flag_type(
+ regex_constants::extended |
+ ((flags&SRE_ICASE) ? int(regex_constants::icase) : 0) |
+ ((flags&SRE_NOSUB) ? int(regex_constants::nosubs) : 0)
)), ok(true), nmatch(nm) {
}
std::regex expr;