From b6b0d83965352bec76ede5e69b8ea99da100749c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 8 Feb 2011 02:21:15 +0000 Subject: [PATCH] revert earlier changes to uuid class, but keep boost version in svn for the future git-svn-id: svn://localhost/ardour2/branches/3.0@8763 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/pbd/pbd/uuid.h | 38 +++++++++++-------------- libs/pbd/pbd/uuid_boost.h | 58 +++++++++++++++++++++++++++++++++++++++ libs/pbd/uuid.cc | 7 +++-- libs/pbd/uuid_boost.cc | 37 +++++++++++++++++++++++++ 4 files changed, 115 insertions(+), 25 deletions(-) create mode 100644 libs/pbd/pbd/uuid_boost.h create mode 100644 libs/pbd/uuid_boost.cc diff --git a/libs/pbd/pbd/uuid.h b/libs/pbd/pbd/uuid.h index 275b72648a..16a67436b7 100644 --- a/libs/pbd/pbd/uuid.h +++ b/libs/pbd/pbd/uuid.h @@ -22,35 +22,29 @@ #define __pbd_uuid_h__ #include -#include -#include +#include namespace PBD { -class UUID : public boost::uuids::uuid { +class 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) - {} + 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); } - operator boost::uuids::uuid() { - return static_cast(*this); - } - - operator boost::uuids::uuid() const { - return static_cast(*this); - } + private: + uuid_t id; - 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 new file mode 100644 index 0000000000..275b72648a --- /dev/null +++ b/libs/pbd/pbd/uuid_boost.h @@ -0,0 +1,58 @@ +/* + 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 +#include +#include + +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(*this); + } + + operator boost::uuids::uuid() const { + return static_cast(*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 1a988b9820..0ffeca23cb 100644 --- a/libs/pbd/uuid.cc +++ b/libs/pbd/uuid.cc @@ -25,13 +25,14 @@ using namespace PBD; UUID& UUID::operator= (std::string const & str) { - boost::uuids::string_generator gen; - *((boost::uuids::uuid*) this) = gen (str); + uuid_parse (str.c_str(), id); return *this; } std::string UUID::to_s () const { - return std::string ((const char*) data, size()); + char buf[37]; + uuid_unparse (id, buf); + return std::string (buf); } diff --git a/libs/pbd/uuid_boost.cc b/libs/pbd/uuid_boost.cc new file mode 100644 index 0000000000..1a988b9820 --- /dev/null +++ b/libs/pbd/uuid_boost.cc @@ -0,0 +1,37 @@ +/* + 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()); +}