diff options
| author | Robin Gareus <robin@gareus.org> | 2014-11-23 22:04:32 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-11-23 23:57:55 +0100 |
| commit | 5aba4df25276c0cb45bb06169f37f7b14a95ecb9 (patch) | |
| tree | 50a721b9c82e3ac584bf456d4464c3c9a1bd2899 /libs | |
| parent | f1926dc863f262e7e28de2cf47b2e443dc6d86b1 (diff) | |
fix/silence various compiler warnings.
* ifdef unused static functions
* brackets around assignment and comparision
* no return statement in function returning non-void
* boost concept_checks.hpp unused-local-typedefs
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/system_exec.h | 2 | ||||
| -rw-r--r-- | libs/ardour/search_paths.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/system_exec.cc | 2 | ||||
| -rw-r--r-- | libs/pbd/mountpoint.cc | 7 |
4 files changed, 12 insertions, 3 deletions
diff --git a/libs/ardour/ardour/system_exec.h b/libs/ardour/ardour/system_exec.h index ae865c7bff..6aa04bc07d 100644 --- a/libs/ardour/ardour/system_exec.h +++ b/libs/ardour/ardour/system_exec.h @@ -40,7 +40,9 @@ public: } private: +#ifndef PLATFORM_WINDOWS static char * _vfork_exec_wrapper; +#endif }; /* end class */ diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc index 85eed77a57..6b54ff566c 100644 --- a/libs/ardour/search_paths.cc +++ b/libs/ardour/search_paths.cc @@ -200,7 +200,7 @@ vst_search_path () if (pProgFilesX86) { // Look for a VST folder under C:\Program Files (x86) - if (pVSTx86 = g_build_filename (pProgFilesX86, "Steinberg", "VSTPlugins", NULL)) + if ((pVSTx86 = g_build_filename (pProgFilesX86, "Steinberg", "VSTPlugins", NULL))) { if (Glib::file_test (pVSTx86, Glib::FILE_TEST_EXISTS)) if (Glib::file_test (pVSTx86, Glib::FILE_TEST_IS_DIR)) @@ -218,7 +218,7 @@ vst_search_path () char *pProgFiles = PBD::get_win_special_folder (CSIDL_PROGRAM_FILES); if (pProgFiles) { - if (pVST = g_build_filename (pProgFiles, "Steinberg", "VSTPlugins", NULL)) { + if ((pVST = g_build_filename (pProgFiles, "Steinberg", "VSTPlugins", NULL))) { if (Glib::file_test (pVST, Glib::FILE_TEST_EXISTS)) if (Glib::file_test (pVST, Glib::FILE_TEST_IS_DIR)) p = g_build_filename (pVST, NULL); diff --git a/libs/ardour/system_exec.cc b/libs/ardour/system_exec.cc index d83165252a..6ee6d809e0 100644 --- a/libs/ardour/system_exec.cc +++ b/libs/ardour/system_exec.cc @@ -27,7 +27,9 @@ using namespace ARDOUR; +#ifndef PLATFORM_WINDOWS char * SystemExec::_vfork_exec_wrapper = NULL; +#endif static char *vfork_exec_wrapper_path() { #ifdef PLATFORM_WINDOWS diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc index 65f011c745..545e71fbf2 100644 --- a/libs/pbd/mountpoint.cc +++ b/libs/pbd/mountpoint.cc @@ -99,7 +99,12 @@ mountpoint (string path) string mountpoint (string path) { - // TODO ... if needed + /* this function is currently only called from 'old_peak_path()' + * via find_broken_peakfile() - only relevant for loading pre + * libsndfile Ardour 2.0 sessions. + */ + assert(0); + return ""; // TODO ... if needed } #else // !HAVE_GETMNTENT |