diff options
Diffstat (limited to 'lib/common/ExcludeList.cpp')
| -rw-r--r-- | lib/common/ExcludeList.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/lib/common/ExcludeList.cpp b/lib/common/ExcludeList.cpp index c7c80ed2..213c4f8e 100644 --- a/lib/common/ExcludeList.cpp +++ b/lib/common/ExcludeList.cpp @@ -101,14 +101,6 @@ std::string ExcludeList::ReplaceSlashesRegex(const std::string& input) const output.replace(pos, 1, "\\" DIRECTORY_SEPARATOR); } -<<<<<<< HEAD - for (std::string::iterator i = output.begin(); i != output.end(); i++) - { - *i = tolower(*i); - } - -======= ->>>>>>> 0.12 return output; } #endif @@ -188,30 +180,19 @@ void ExcludeList::AddRegexEntries(const std::string &rEntries) try { std::string entry = *i; -<<<<<<< HEAD -======= int flags = REG_EXTENDED | REG_NOSUB; ->>>>>>> 0.12 // Convert any forward slashes in the string // to appropriately escaped backslashes #ifdef WIN32 entry = ReplaceSlashesRegex(entry); -<<<<<<< HEAD - #endif - - // Compile - int errcode = ::regcomp(pregex, entry.c_str(), - REG_EXTENDED | REG_NOSUB); -======= flags |= REG_ICASE; // Windows convention #endif // Compile int errcode = ::regcomp(pregex, entry.c_str(), flags); ->>>>>>> 0.12 if (errcode != 0) { @@ -254,10 +235,7 @@ bool ExcludeList::IsExcluded(const std::string &rTest) const std::string test = rTest; #ifdef WIN32 -<<<<<<< HEAD -======= // converts to lower case as well ->>>>>>> 0.12 test = ReplaceSlashesDefinite(test); #endif |