summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-08-10 23:09:54 +0000
committerDavid Robillard <d@drobilla.net>2012-08-10 23:09:54 +0000
commitcbea22cd669eab29773674cb6c258ca80d45b878 (patch)
tree40de026548d19b0709ce46225b50f994f9481c07 /src/server
parent762435ea92bbeed0b36afc5fa4303540f3e72ba1 (diff)
downloadingen-cbea22cd669eab29773674cb6c258ca80d45b878.tar.gz
ingen-cbea22cd669eab29773674cb6c258ca80d45b878.tar.bz2
ingen-cbea22cd669eab29773674cb6c258ca80d45b878.zip
Fix a ton of warnings.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4648 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
-rw-r--r--src/server/GraphObjectImpl.cpp5
-rw-r--r--src/server/PatchImpl.cpp2
-rw-r--r--src/server/ingen_lv2.cpp2
-rw-r--r--src/server/mix.cpp1
4 files changed, 7 insertions, 3 deletions
diff --git a/src/server/GraphObjectImpl.cpp b/src/server/GraphObjectImpl.cpp
index 0d07b510..0b66d05e 100644
--- a/src/server/GraphObjectImpl.cpp
+++ b/src/server/GraphObjectImpl.cpp
@@ -16,6 +16,8 @@
#include <string>
+#include "raul/log.hpp"
+
#include "GraphObjectImpl.hpp"
#include "PatchImpl.hpp"
#include "ThreadManager.hpp"
@@ -53,7 +55,8 @@ GraphObjectImpl::parent_patch() const
SharedPtr<GraphObject>
GraphObjectImpl::find_child(const std::string& name) const
{
- throw;
+ Raul::error("GraphObjectImpl::find_child called\n");
+ return SharedPtr<GraphObject>();
}
} // namespace Server
diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp
index ee5ea230..16cff0c9 100644
--- a/src/server/PatchImpl.cpp
+++ b/src/server/PatchImpl.cpp
@@ -389,7 +389,7 @@ PatchImpl::compile() const
for (Nodes::const_iterator i = _nodes.begin(); i != _nodes.end(); ++i) {
NodeImpl* const node = (*i);
// Either a sink or connected to our output ports:
- if (!node->traversed() && node->dependants().size() == 0)
+ if (!node->traversed() && node->dependants().empty())
compile_recursive(node, compiled_patch);
}
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 7da7f476..33de440f 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -709,7 +709,7 @@ ingen_restore(LV2_Handle instance,
return LV2_STATE_SUCCESS;
}
-const void*
+static const void*
ingen_extension_data(const char* uri)
{
static const LV2_State_Interface state = { ingen_save, ingen_restore };
diff --git a/src/server/mix.cpp b/src/server/mix.cpp
index c340a8a2..b4ba4b8a 100644
--- a/src/server/mix.cpp
+++ b/src/server/mix.cpp
@@ -21,6 +21,7 @@
#include "Buffer.hpp"
#include "Context.hpp"
+#include "mix.hpp"
namespace Ingen {
namespace Server {