From 8b2ee6db1909e89cb5a0c9d689946cc92fcc90fe Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 3 Feb 2013 17:12:00 +0000 Subject: Fix compilation with Clang 3.1. git-svn-id: http://svn.drobilla.net/lad/trunk/machina@5039 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/JackDriver.cpp | 1 - src/engine/Node.hpp | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/engine') 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& a, const SPtr& b) { - return a < b; + inline bool operator()(const SPtr& a, + const SPtr& b) { + return a.get() < b.get(); } }; -- cgit v1.2.1