diff options
| author | David Robillard <d@drobilla.net> | 2010-03-21 18:27:06 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-03-21 18:27:06 +0000 |
| commit | ed2171b1ccb376c693532825230982b088c66ae8 (patch) | |
| tree | a2c934f6a9bcb2935f363af2782d95e12d0f44c9 /src/engine/machina | |
| parent | 55a6b71971b2fe55def218e3b3021a4c39308240 (diff) | |
| download | machina-ed2171b1ccb376c693532825230982b088c66ae8.tar.gz machina-ed2171b1ccb376c693532825230982b088c66ae8.tar.bz2 machina-ed2171b1ccb376c693532825230982b088c66ae8.zip | |
Fix Eugene and Machine compilation.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2549 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/machina')
| -rw-r--r-- | src/engine/machina/JackDriver.hpp | 2 | ||||
| -rw-r--r-- | src/engine/machina/Mutation.hpp | 4 | ||||
| -rw-r--r-- | src/engine/machina/Problem.hpp | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/machina/JackDriver.hpp b/src/engine/machina/JackDriver.hpp index 4ec0472..8279cda 100644 --- a/src/engine/machina/JackDriver.hpp +++ b/src/engine/machina/JackDriver.hpp @@ -20,12 +20,12 @@ #include <boost/enable_shared_from_this.hpp> #include <jack/midiport.h> -#include "raul/JackDriver.hpp" #include "raul/SharedPtr.hpp" #include "raul/DoubleBuffer.hpp" #include "raul/EventRingBuffer.hpp" #include "raul/Semaphore.hpp" #include "raul/Command.hpp" +#include "RaulJackDriver.hpp" #include "Machine.hpp" #include "Driver.hpp" #include "Recorder.hpp" diff --git a/src/engine/machina/Mutation.hpp b/src/engine/machina/Mutation.hpp index 632cfbc..e3bbca1 100644 --- a/src/engine/machina/Mutation.hpp +++ b/src/engine/machina/Mutation.hpp @@ -24,7 +24,7 @@ #include "eugene/Mutation.hpp" #define SUPER : public Eugene::Mutation<Machine> #else - #define SUPER + #define SUPER : public Mutation #endif namespace Machina { @@ -33,7 +33,7 @@ class Machine; namespace Mutation { -struct Mutation { virtual void mutate(Machine& machine) = 0; }; +struct Mutation { virtual ~Mutation() {}; virtual void mutate(Machine& machine) = 0; }; struct Compress SUPER { void mutate(Machine& machine); }; struct AddNode SUPER { void mutate(Machine& machine); }; diff --git a/src/engine/machina/Problem.hpp b/src/engine/machina/Problem.hpp index fcb7874..e25c5a1 100644 --- a/src/engine/machina/Problem.hpp +++ b/src/engine/machina/Problem.hpp @@ -29,6 +29,7 @@ namespace Machina { class Problem : public Eugene::Problem<Machine> { public: Problem(TimeUnit unit, const std::string& target_midi, SharedPtr<Machine> seed = SharedPtr<Machine>()); + virtual ~Problem() {} void seed(SharedPtr<Machine> parent) { _seed = parent; } |