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/ardour/test | |
| 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/ardour/test')
| -rw-r--r-- | libs/ardour/test/plugins_test.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/test/resampled_source_test.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/test/test_common.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/test/test_common.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/test/plugins_test.cc b/libs/ardour/test/plugins_test.cc index 362a56df7f..0e4bddcda6 100644 --- a/libs/ardour/test/plugins_test.cc +++ b/libs/ardour/test/plugins_test.cc @@ -32,7 +32,7 @@ PluginsTest::test () pm.refresh (); - SearchPath ladspa_paths(ladspa_search_path ()); + Searchpath ladspa_paths(ladspa_search_path ()); cout << "Number of Ladspa paths found: " << ladspa_paths.size () << endl; diff --git a/libs/ardour/test/resampled_source_test.cc b/libs/ardour/test/resampled_source_test.cc index 5aaf71b7aa..c8ef0f4a95 100644 --- a/libs/ardour/test/resampled_source_test.cc +++ b/libs/ardour/test/resampled_source_test.cc @@ -1,4 +1,4 @@ -// this is included first to avoid SearchPath definition on windows +// this is included first to avoid Searchpath definition on windows #include "test_common.h" #include "pbd/file_utils.h" diff --git a/libs/ardour/test/test_common.cc b/libs/ardour/test/test_common.cc index 68039b289b..5f802fbf5a 100644 --- a/libs/ardour/test/test_common.cc +++ b/libs/ardour/test/test_common.cc @@ -25,7 +25,7 @@ using namespace std; -PBD::SearchPath +PBD::Searchpath test_search_path () { #ifdef PLATFORM_WINDOWS diff --git a/libs/ardour/test/test_common.h b/libs/ardour/test/test_common.h index 9e15458781..10bfdbc694 100644 --- a/libs/ardour/test/test_common.h +++ b/libs/ardour/test/test_common.h @@ -21,7 +21,7 @@ #include "pbd/search_path.h" -PBD::SearchPath test_search_path (); +PBD::Searchpath test_search_path (); std::string new_test_output_dir (); |