Merge branch 'clang' of https://github.com/axetota/ardour

5 files changed, 26 insertions, 13 deletions

diff --git a/libs/audiographer/audiographer/debug_utils.h b/libs/audiographer/audiographer/debug_utils.h
index a1d8259716..a1dad22eaf 100644
--- a/libs/audiographer/audiographer/debug_utils.h
+++ b/libs/audiographer/audiographer/debug_utils.h
@@ -3,6 +3,7 @@
 
 #include "flag_field.h"
 
+#include <cstdlib>
 #include <string>
 
 #ifdef __GNUC__
@@ -24,7 +25,7 @@ struct DebugUtils
 		char * res = abi::__cxa_demangle (typeid(obj).name(), 0, 0, &status);
 		if (status == 0) {
 			std::string s(res);
-			free (res);
+			std::free (res);
 			return s;
 		}
 #endif
diff --git a/libs/evoral/evoral/PatchChange.hpp b/libs/evoral/evoral/PatchChange.hpp
index b1a42c6f2e..53b50a3383 100644
--- a/libs/evoral/evoral/PatchChange.hpp
+++ b/libs/evoral/evoral/PatchChange.hpp
@@ -123,7 +123,7 @@ public:
 			return time() < o.time();
 		}
 
-		if (bank != o.bank()) {
+		if (bank() != o.bank()) {
 			return bank() < o.bank();
 		}
 
diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp
index b56c234d75..204ef58f33 100644
--- a/libs/evoral/src/Sequence.cpp
+++ b/libs/evoral/src/Sequence.cpp
@@ -24,6 +24,10 @@
 #include <stdint.h>
 #include <cstdio>
 
+#if __clang__
+#include "evoral/Note.hpp"
+#endif
+
 #include "pbd/compose.h"
 #include "pbd/error.h"
 
diff --git a/libs/pbd/pbd/stl_delete.h b/libs/pbd/pbd/stl_delete.h
index 66fb027387..ac2161560c 100644
--- a/libs/pbd/pbd/stl_delete.h
+++ b/libs/pbd/pbd/stl_delete.h
@@ -20,11 +20,19 @@
 #ifndef __libmisc_stl_delete_h__
 #define __libmisc_stl_delete_h__
 
+
+#if __clang__ && __APPLE__ && __cplusplus >= 201103L
+#include <vector>
+#ifndef _CPP_VECTOR
+#define _CPP_VECTOR
+#endif
+#endif
+
 /* To actually use any of these deletion functions, you need to
    first include the revelant container type header.
 */
 #if defined(_CPP_VECTOR) || defined(_GLIBCXX_VECTOR) || defined(__SGI_STL_VECTOR)
-template<class T> void vector_delete (std::vector<T *> *vec) 
+template<class T> void vector_delete (std::vector<T *> *vec)
 {
 	typename std::vector<T *>::iterator i;
 	
diff --git a/libs/surfaces/generic_midi/interface.cc b/libs/surfaces/generic_midi/interface.cc
index 94edb0ba80..57f56bd399 100644
--- a/libs/surfaces/generic_midi/interface.cc
+++ b/libs/surfaces/generic_midi/interface.cc
@@ -56,17 +56,17 @@ probe_generic_midi_protocol (ControlProtocolDescriptor* /*descriptor*/)
 }
 
 static ControlProtocolDescriptor generic_midi_descriptor = {
-	name : "Generic MIDI",
-	id : "uri://ardour.org/surfaces/generic_midi:0",
-	ptr : 0,
-	module : 0,
-	mandatory : 0,
-	supports_feedback : true,
-	probe : probe_generic_midi_protocol,
-	initialize : new_generic_midi_protocol,
-	destroy : delete_generic_midi_protocol
+	.name = "Generic MIDI",
+	.id = "uri://ardour.org/surfaces/generic_midi:0",
+	.ptr = 0,
+	.module = 0,
+	.mandatory = 0,
+	.supports_feedback = true,
+	.probe = probe_generic_midi_protocol,
+	.initialize = new_generic_midi_protocol,
+	.destroy = delete_generic_midi_protocol
 };
-	
+
 
 extern "C" {
 ControlProtocolDescriptor*