From 2499c41097f8410cb3016e095a85d68979485a7b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 17 Aug 2013 21:47:08 +0100
Subject: Various bits mostly related to colour conversions.

---
 src/lib/server.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/lib/server.h')

diff --git a/src/lib/server.h b/src/lib/server.h
index 6307c1867..56a1fdab9 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_SERVER_H
+#define DCPOMATIC_SERVER_H
+
 /** @file src/server.h
  *  @brief Class to describe a server to which we can send
  *  encoding work, and a class to implement such a server.
@@ -78,7 +81,7 @@ public:
 
 	void as_xml (xmlpp::Node *) const;
 	
-	static boost::shared_ptr<ServerDescription> create_from_metadata (std::string v);
+	static boost::optional<ServerDescription> create_from_metadata (std::string);
 
 private:
 	/** server's host name */
@@ -104,3 +107,5 @@ private:
 	boost::condition _worker_condition;
 	boost::shared_ptr<Log> _log;
 };
+
+#endif
-- 
cgit v1.2.3