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

7 files changed, 17 insertions, 4 deletions

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 2a681102cf..0c6fbce69f 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -129,6 +129,7 @@ Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_n
 	return false; /* do not call again */
 }
 
+#ifndef PLATFORM_WINDOWS
 static void
 sigpipe_handler (int /*signal*/)
 {
@@ -143,6 +144,7 @@ sigpipe_handler (int /*signal*/)
 		done_the_backend_thing =  true;
 	}
 }
+#endif
 
 #if (defined(COMPILER_MSVC) && defined(NDEBUG) && !defined(RDC_BUILD))
 /*
diff --git a/gtk2_ardour/pingback.cc b/gtk2_ardour/pingback.cc
index 62d9191daf..8e4a32628d 100644
--- a/gtk2_ardour/pingback.cc
+++ b/gtk2_ardour/pingback.cc
@@ -42,6 +42,7 @@
 using std::string;
 using namespace ARDOUR;
 
+#ifndef PLATFORM_WINDOWS // no pingback for windows, so far
 static size_t
 curl_write_data (char *bufptr, size_t size, size_t nitems, void *ptr)
 {
@@ -61,6 +62,7 @@ curl_write_data (char *bufptr, size_t size, size_t nitems, void *ptr)
 
         return size * nitems;
 }
+#endif
 
 struct ping_call {
     std::string version;
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
diff --git a/wscript b/wscript
index df1aea53e4..63d379bcfb 100644
--- a/wscript
+++ b/wscript
@@ -385,7 +385,7 @@ def set_compiler_flags (conf,opt):
             ('-Wall', '-Wpointer-arith', '-Wcast-qual', '-Wcast-align', '-Wno-unused-parameter'))
 
     c_flags.extend(('-Wstrict-prototypes', '-Wmissing-prototypes'))
-    cxx_flags.append('-Woverloaded-virtual')
+    cxx_flags.extend(('-Woverloaded-virtual', '-Wno-unused-local-typedefs))
 
     #
     # more boilerplate