Try to fix clashes caused by ERROR, WARNING etc. as variables.

[dcpomatic.git] / src / lib / server.h

diff --git a/src/lib/server.h b/src/lib/server.h
index 68de3c2f04960d6d32713632432d33b906713dab..a9b4b1c1c8982ed9d57c615c9cee6fcfd9df0324 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -32,6 +32,7 @@
 #include <boost/optional.hpp>
 #include <libxml++/libxml++.h>
 #include "log.h"
+#include "exceptions.h"
 
 class Socket;
 
@@ -58,8 +59,6 @@ public:
                , _threads (t)
        {}
 
-       ServerDescription (boost::shared_ptr<const cxml::Node>);
-
        /* Default copy constructor is fine */
        
        /** @return server's host name or IP address in string form */
@@ -80,10 +79,6 @@ public:
                _threads = t;
        }
 
-       void as_xml (xmlpp::Node *) const;
-       
-       static boost::optional<ServerDescription> create_from_metadata (std::string);
-
 private:
        /** server's host name */
        std::string _host_name;
@@ -91,7 +86,7 @@ private:
        int _threads;
 };
 
-class Server : public boost::noncopyable
+class Server : public ExceptionStore, public boost::noncopyable
 {
 public:
        Server (boost::shared_ptr<Log> log, bool verbose);