summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-10-22 15:23:14 +0000
committerDavid Robillard <d@drobilla.net>2011-10-22 15:23:14 +0000
commit6fe17c9cd2561fb32e382a97701a5343451d8b7f (patch)
tree7b866a877c0a780065a07863110deaa0405a5fc0 /include
parent1f7a9fc296605a2d58312a9133b1a4f90bdb3724 (diff)
downloadingen-6fe17c9cd2561fb32e382a97701a5343451d8b7f.tar.gz
ingen-6fe17c9cd2561fb32e382a97701a5343451d8b7f.tar.bz2
ingen-6fe17c9cd2561fb32e382a97701a5343451d8b7f.zip
Fix compilation on Mac OS X
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3591 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'include')
-rw-r--r--include/ingen/client/ThreadedSigClientInterface.hpp1
-rw-r--r--include/ingen/serialisation/Serialiser.hpp28
-rw-r--r--include/ingen/shared/Store.hpp1
3 files changed, 16 insertions, 14 deletions
diff --git a/include/ingen/client/ThreadedSigClientInterface.hpp b/include/ingen/client/ThreadedSigClientInterface.hpp
index 64901e8f..3de2eaea 100644
--- a/include/ingen/client/ThreadedSigClientInterface.hpp
+++ b/include/ingen/client/ThreadedSigClientInterface.hpp
@@ -22,6 +22,7 @@
#include <string>
+#undef nil
#include <sigc++/sigc++.h>
#include <glibmm/thread.h>
diff --git a/include/ingen/serialisation/Serialiser.hpp b/include/ingen/serialisation/Serialiser.hpp
index 4dbb78de..111794d7 100644
--- a/include/ingen/serialisation/Serialiser.hpp
+++ b/include/ingen/serialisation/Serialiser.hpp
@@ -49,29 +49,29 @@ class Serialiser
{
public:
Serialiser(Shared::World& world, SharedPtr<Shared::Store> store);
- ~Serialiser();
+ virtual ~Serialiser();
typedef GraphObject::Properties Properties;
- void to_file(SharedPtr<const GraphObject> object,
- const std::string& filename);
+ virtual void to_file(SharedPtr<const GraphObject> object,
+ const std::string& filename);
- void write_bundle(SharedPtr<const Patch> patch,
- const std::string& path);
+ virtual void write_bundle(SharedPtr<const Patch> patch,
+ const std::string& path);
- std::string to_string(SharedPtr<const GraphObject> object,
- const std::string& base_uri,
- const Properties& extra_rdf);
+ virtual std::string to_string(SharedPtr<const GraphObject> object,
+ const std::string& base_uri,
+ const Properties& extra_rdf);
- void start_to_string(const Raul::Path& root,
- const std::string& base_uri);
+ virtual void start_to_string(const Raul::Path& root,
+ const std::string& base_uri);
- void serialise(SharedPtr<const GraphObject> object) throw (std::logic_error);
+ virtual void serialise(SharedPtr<const GraphObject> object) throw (std::logic_error);
- void serialise_connection(const Sord::Node& parent,
- SharedPtr<const Connection> c) throw (std::logic_error);
+ virtual void serialise_connection(const Sord::Node& parent,
+ SharedPtr<const Connection> c) throw (std::logic_error);
- std::string finish();
+ virtual std::string finish();
private:
struct Impl;
diff --git a/include/ingen/shared/Store.hpp b/include/ingen/shared/Store.hpp
index cc78e946..3347cdde 100644
--- a/include/ingen/shared/Store.hpp
+++ b/include/ingen/shared/Store.hpp
@@ -20,6 +20,7 @@
#include <string>
+#undef nil
#include <glibmm/thread.h>
#include "raul/PathTable.hpp"