From cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 1 Feb 2014 00:26:34 +0100
Subject: Instance: add Database attribute

Move from db/DatabaseGlue.cxx, eliminating global variable.
---
 src/SongLoader.hxx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/SongLoader.hxx')

diff --git a/src/SongLoader.hxx b/src/SongLoader.hxx
index 997c0fb18..9914db8e6 100644
--- a/src/SongLoader.hxx
+++ b/src/SongLoader.hxx
@@ -45,19 +45,16 @@ class SongLoader {
 
 public:
 #ifdef ENABLE_DATABASE
-	SongLoader(const Client *_client, const Database *_db=nullptr)
-		:client(_client), db(_db) {}
-	explicit SongLoader(const Client &_client)
-		:client(&_client), db(nullptr) {}
+	explicit SongLoader(const Client &_client);
 	explicit SongLoader(const Database *_db)
 		:client(nullptr), db(_db) {}
-	explicit SongLoader(std::nullptr_t)
-		:client(nullptr), db(nullptr) {}
+	explicit SongLoader(const Client &_client, const Database *_db)
+		:client(&_client), db(_db) {}
 #else
 	explicit SongLoader(const Client &_client)
 		:client(&_client) {}
-	explicit SongLoader(const Client *_client)
-		:client(_client) {}
+	explicit SongLoader(std::nullptr_t)
+		:client(nullptr) {}
 #endif
 
 	gcc_nonnull_all
-- 
cgit v1.2.3