From 0faf69db76f668944d9380152fd4f9080d9e6152 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 12 Feb 2017 21:16:12 +0100
Subject: Fix warnings

---
 ingen/Configuration.hpp | 9 ---------
 src/Configuration.cpp   | 2 +-
 src/ingen/ingen.cpp     | 2 +-
 tests/ingen_test.cpp    | 2 +-
 wscript                 | 3 ++-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/ingen/Configuration.hpp b/ingen/Configuration.hpp
index 6d4655d6..e069220d 100644
--- a/ingen/Configuration.hpp
+++ b/ingen/Configuration.hpp
@@ -118,15 +118,6 @@ public:
 
 private:
 	struct Option {
-	public:
-		Option(const std::string& k, const std::string& n, char l,
-		       const std::string& d, Scope s,
-		       const LV2_URID type, const Atom& def)
-			: key(k), name(n), letter(l)
-			, desc(d), scope(s)
-			, type(type), value(def)
-		{}
-
 		std::string key;
 		std::string name;
 		char        letter;
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index e165118f..603c1c9d 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -86,7 +86,7 @@ Configuration::add(const std::string& key,
 {
 	assert(value.type() == type || value.type() == 0);
 	_max_name_length = std::max(_max_name_length, name.length());
-	_options.insert(make_pair(name, Option(key, name, letter, desc, scope, type, value)));
+	_options.insert(make_pair(name, Option{key, name, letter, desc, scope, type, value}));
 	if (!key.empty()) {
 		_keys.insert(make_pair(key, name));
 	}
diff --git a/src/ingen/ingen.cpp b/src/ingen/ingen.cpp
index 1e407507..9ca4b276 100644
--- a/src/ingen/ingen.cpp
+++ b/src/ingen/ingen.cpp
@@ -86,7 +86,7 @@ int
 main(int argc, char** argv)
 {
 	Glib::thread_init();
-	Ingen::set_bundle_path_from_code((void*)&main);
+	Ingen::set_bundle_path_from_code((void*)&print_version);
 
 	// Create world
 	try {
diff --git a/tests/ingen_test.cpp b/tests/ingen_test.cpp
index d0cf77c3..97156ff9 100644
--- a/tests/ingen_test.cpp
+++ b/tests/ingen_test.cpp
@@ -153,7 +153,7 @@ int
 main(int argc, char** argv)
 {
 	Glib::thread_init();
-	set_bundle_path_from_code((void*)&main);
+	set_bundle_path_from_code((void*)&flush_events);
 
 	// Create world
 	try {
diff --git a/wscript b/wscript
index 7a15d63f..538e2b84 100644
--- a/wscript
+++ b/wscript
@@ -153,7 +153,8 @@ def configure(conf):
 
     if conf.check(cflags=['-pthread'], mandatory=False):
         conf.env.PTHREAD_CFLAGS    = ['-pthread']
-        conf.env.PTHREAD_LINKFLAGS = ['-pthread']
+        if conf.env.CXX_NAME != 'clang':
+            conf.env.PTHREAD_LINKFLAGS = ['-pthread']
     elif conf.check(linkflags=['-lpthread'], mandatory=False):
         conf.env.PTHREAD_CFLAGS    = []
         conf.env.PTHREAD_LINKFLAGS = ['-lpthread']
-- 
cgit v1.2.1