Fix possbile conflict with SearchPathW

This commit is contained in:
Benau 2020-04-10 10:02:53 +08:00
parent 5aafb42b28
commit ccc4bc793d
2 changed files with 4 additions and 4 deletions

View File

@ -120,7 +120,7 @@ DictionaryManager::get_dictionary(const Language& language)
dictionaries[language] = dict; dictionaries[language] = dict;
for (SearchPath::reverse_iterator p = search_path.rbegin(); p != search_path.rend(); ++p) for (Search_Path::reverse_iterator p = search_path.rbegin(); p != search_path.rend(); ++p)
{ {
std::vector<std::string> files = filesystem->open_directory(*p); std::vector<std::string> files = filesystem->open_directory(*p);
@ -191,7 +191,7 @@ DictionaryManager::get_languages()
{ {
std::set<Language> languages; std::set<Language> languages;
for (SearchPath::iterator p = search_path.begin(); p != search_path.end(); ++p) for (Search_Path::iterator p = search_path.begin(); p != search_path.end(); ++p)
{ {
std::vector<std::string> files = filesystem->open_directory(*p); std::vector<std::string> files = filesystem->open_directory(*p);

View File

@ -42,8 +42,8 @@ private:
typedef std::map<Language, Dictionary*> Dictionaries; typedef std::map<Language, Dictionary*> Dictionaries;
Dictionaries dictionaries; Dictionaries dictionaries;
typedef std::vector<std::string> SearchPath; typedef std::vector<std::string> Search_Path;
SearchPath search_path; Search_Path search_path;
std::string charset; std::string charset;
bool use_fuzzy; bool use_fuzzy;