aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-02-03 17:12:00 +0000
committerDavid Robillard <d@drobilla.net>2013-02-03 17:12:00 +0000
commit8b2ee6db1909e89cb5a0c9d689946cc92fcc90fe (patch)
tree7e1aa5078ed3f6bea7663f9c5df24a52d6fa3ba1
parente9935704f8b035045d05b912f4f038bfff83a6c6 (diff)
downloadmachina-8b2ee6db1909e89cb5a0c9d689946cc92fcc90fe.tar.gz
machina-8b2ee6db1909e89cb5a0c9d689946cc92fcc90fe.tar.bz2
machina-8b2ee6db1909e89cb5a0c9d689946cc92fcc90fe.zip
Fix compilation with Clang 3.1.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@5039 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/engine/JackDriver.cpp1
-rw-r--r--src/engine/Node.hpp7
2 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp
index 27d295c..0b25acc 100644
--- a/src/engine/JackDriver.cpp
+++ b/src/engine/JackDriver.cpp
@@ -310,7 +310,6 @@ JackDriver::on_process(jack_nframes_t nframes)
jack_midi_clear_buffer(jack_port_get_buffer(_output_port, nframes));
TimeStamp length_ticks(TimeStamp(_context.time().ticks_unit(), nframes));
- TimeStamp length_beats(_context.time().ticks_to_beats(length_ticks));
_context.time().set_length(length_ticks);
_context.time().set_offset(TimeStamp(_context.time().ticks_unit(), 0, 0));
diff --git a/src/engine/Node.hpp b/src/engine/Node.hpp
index 8a76bf7..39f23e6 100644
--- a/src/engine/Node.hpp
+++ b/src/engine/Node.hpp
@@ -22,9 +22,9 @@
#include "machina/types.hpp"
#include "Action.hpp"
+#include "MIDISink.hpp"
#include "Schrodinbit.hpp"
#include "Stateful.hpp"
-#include "MIDISink.hpp"
namespace machina {
@@ -83,8 +83,9 @@ public:
inline void set_changed() { _changed = true; }
struct EdgeHeadOrder {
- inline bool operator()(const SPtr<Edge>& a, const SPtr<Edge>& b) {
- return a < b;
+ inline bool operator()(const SPtr<const Edge>& a,
+ const SPtr<const Edge>& b) {
+ return a.get() < b.get();
}
};