Accommodate newly added/removed source(s) in our MSVC project (libpbd)

[ardour.git] / libs / pbd / pbd / uuid.h

diff --git a/libs/pbd/pbd/uuid.h b/libs/pbd/pbd/uuid.h
index 16a67436b70c36bd57d040183a72d491eccc32d4..39817ade1a2c9c4f957f78cb32b7be91f63fbd50 100644 (file)
--- a/libs/pbd/pbd/uuid.h
+++ b/libs/pbd/pbd/uuid.h
@@ -22,29 +22,29 @@
 #define __pbd_uuid_h__
 
 #include <string>
-#include <uuid/uuid.h>
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+
+#include "pbd/libpbd_visibility.h"
 
 namespace PBD {
 
-class UUID {
+class LIBPBD_API UUID : public boost::uuids::uuid {
 
   public:
-       UUID () { uuid_generate (id); }
-       UUID (UUID const & other) { uuid_copy (id, other.id); }
-       UUID (std::string const & str) { uuid_parse (str.c_str(), id); }
-       
-       UUID& operator= (std::string const & str);
-       std::string to_s () const;
-       
-       bool operator== (UUID const & other) const { return !uuid_compare (id, other.id); }
-       bool operator!= (UUID const & other) const { return uuid_compare (id, other.id); }
-       bool operator< (UUID const & other) const { return uuid_compare (id, other.id) < 0; }
-       
-       operator bool() const { return !uuid_is_null (id); }
-
-  private:
-       uuid_t id;
+    UUID ()
+            : boost::uuids::uuid (boost::uuids::random_generator()()) {}
+    UUID (std::string const & str)
+            : boost::uuids::uuid (boost::uuids::string_generator()(str)) {}
+
+    explicit UUID (boost::uuids::uuid const& u)
+            : boost::uuids::uuid(u)
+    {}
+
+    UUID& operator= (std::string const & str);
+    std::string to_s () const;
 
+    operator bool() const { return !is_nil(); }
 };
 
 } // namespace PBD