diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2013-08-15 20:04:08 +1000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2013-09-06 14:31:11 +1000 |
commit | 8ddd12a60d08d895cb5400013cdda2e893fb81bb (patch) | |
tree | 84c0082083295835e33c38c12acc5e21cb9b7c7e /libs/pbd/file_utils.cc | |
parent | e6c7ecf0e369ba886a7dc57a195226921f0f11f1 (diff) |
Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.
Diffstat (limited to 'libs/pbd/file_utils.cc')
-rw-r--r-- | libs/pbd/file_utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index 50287149e1..44254989c1 100644 --- a/libs/pbd/file_utils.cc +++ b/libs/pbd/file_utils.cc @@ -104,7 +104,7 @@ find_matching_files_in_directories (const vector<std::string>& paths, } void -find_matching_files_in_search_path (const SearchPath& search_path, +find_matching_files_in_search_path (const Searchpath& search_path, const Glib::PatternSpec& pattern, vector<std::string>& result) { @@ -112,7 +112,7 @@ find_matching_files_in_search_path (const SearchPath& search_path, } bool -find_file_in_search_path(const SearchPath& search_path, +find_file_in_search_path(const Searchpath& search_path, const string& filename, std::string& result) { |