Use boost::uuid instead of libuuid

diff --git a/libs/pbd/pbd/uuid.h b/libs/pbd/pbd/uuid.h
index 16a67436b70c36bd57d040183a72d491eccc32d4..bf5abfc1acde5c9e3dea950deb8f8b2f0d267068 100644 (file)
--- a/libs/pbd/pbd/uuid.h
+++ b/libs/pbd/pbd/uuid.h
@@ -22,29 +22,35 @@
 #define __pbd_uuid_h__
 
 #include <string>
-#include <uuid/uuid.h>
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_generators.hpp>
 
 namespace PBD {
 
-class UUID {
+class 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)
+    {}
+
+    operator boost::uuids::uuid() {
+            return static_cast<boost::uuids::uuid&>(*this);
+    }
+
+    operator boost::uuids::uuid() const {
+            return static_cast<boost::uuids::uuid const&>(*this);
+    }
+
+    UUID& operator= (std::string const & str);
+    std::string to_s () const;
+
+    operator bool() const { return !is_nil(); }
 };
 
 } // namespace PBD

diff --git a/libs/pbd/pbd/uuid_boost.h b/libs/pbd/pbd/uuid_boost.h
deleted file mode 100644 (file)
index 275b726..0000000
--- a/libs/pbd/pbd/uuid_boost.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (C) 2008 Paul Davis
-    Author: Sakari Bergen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __pbd_uuid_h__
-#define __pbd_uuid_h__
-
-#include <string>
-#include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-
-namespace PBD {
-
-class UUID : public boost::uuids::uuid {
-
-  public:
-    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)
-    {}
-
-    operator boost::uuids::uuid() {
-            return static_cast<boost::uuids::uuid&>(*this);
-    }
-    
-    operator boost::uuids::uuid() const {
-            return static_cast<boost::uuids::uuid const&>(*this);
-    }
-
-    UUID& operator= (std::string const & str);
-    std::string to_s () const;
-    
-    operator bool() const { return !is_nil(); }
-};
-
-} // namespace PBD
-
-#endif // __pbd_uuid_h__

diff --git a/libs/pbd/uuid.cc b/libs/pbd/uuid.cc
index 0ffeca23cba4418973a737c04ae1b4791aa58b91..1a988b9820324ed55e4f40fca1fd6cd742a91d98 100644 (file)
--- a/libs/pbd/uuid.cc
+++ b/libs/pbd/uuid.cc
@@ -25,14 +25,13 @@ using namespace PBD;
 UUID&
 UUID::operator= (std::string const & str)
 {
-       uuid_parse (str.c_str(), id);
+        boost::uuids::string_generator gen;
+        *((boost::uuids::uuid*) this) = gen (str);
        return *this;
 }
 
 std::string
 UUID::to_s () const
 {
-       char buf[37];
-       uuid_unparse (id, buf);
-       return std::string (buf);
+        return std::string ((const char*) data, size());
 }

diff --git a/libs/pbd/uuid_boost.cc b/libs/pbd/uuid_boost.cc
deleted file mode 100644 (file)
index 1a988b9..0000000
--- a/libs/pbd/uuid_boost.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    Copyright (C) 2008 Paul Davis
-    Author: Sakari Bergen
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "pbd/uuid.h"
-
-using namespace PBD;
-
-UUID&
-UUID::operator= (std::string const & str)
-{
-        boost::uuids::string_generator gen;
-        *((boost::uuids::uuid*) this) = gen (str);
-       return *this;
-}
-
-std::string
-UUID::to_s () const
-{
-        return std::string ((const char*) data, size());
-}

diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index 5c8ed194a8d38e1296dc0822f0226b6380980ad9..77403bddf46d5845de22ca8f4d492a8e92c5ae8c 100644 (file)
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -89,8 +89,6 @@ def configure(conf):
     autowaf.configure(conf)
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP', atleast_version='2.0')
-    if sys.platform != 'darwin':
-        autowaf.check_pkg(conf, 'uuid', uselib_store='UUID')
 
     conf.check(function_name='getmntent', header_name='mntent.h', define_name='HAVE_GETMNTENT',mandatory=False)
     conf.check(header_name='execinfo.h', define_name='HAVE_EXECINFO',mandatory=False)
@@ -102,7 +100,6 @@ def configure(conf):
     # Boost headers
     autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
     autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
-    # autowaf.check_header(conf, 'cxx', 'boost/uuid/uuid.hpp')
 
 def build(bld):