smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

revert earlier changes to uuid class, but keep boost version in svn for the future

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8763 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-02-08 02:21:15 +00:00
parent 25a7bb4825
commit b6b0d83965
4 changed files with 115 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
libs/pbd/pbd/uuid.h
View file

@ -22,35 +22,29 @@
#define __pbd_uuid_h__
#include <string>
#include <boost/uuid/uuid.hpp>
#include <boost/uuid/uuid_generators.hpp>
#include <uuid/uuid.h>
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<boost::uuids::uuid&>(*this);
}
operator boost::uuids::uuid() const {
return static_cast<boost::uuids::uuid const&>(*this);
}
private:
uuid_t id;
UUID& operator= (std::string const & str);
std::string to_s () const;
operator bool() const { return !is_nil(); }
};
} // namespace PBD

58
libs/pbd/pbd/uuid_boost.h Normal file
View file

@ -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 <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__

7
libs/pbd/uuid.cc
View file

@ -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);
}

37
libs/pbd/uuid_boost.cc Normal file
View file

@ -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());
}