Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc

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

diff --git a/libs/pbd/uuid.cc b/libs/pbd/uuid.cc
index 1a988b9820324ed55e4f40fca1fd6cd742a91d98..8b55ab338169b3b263d0bbefaf76e03e221ea47a 100644 (file)
--- a/libs/pbd/uuid.cc
+++ b/libs/pbd/uuid.cc
@@ -20,10 +20,8 @@
 
 #include "pbd/uuid.h"
 
-using namespace PBD;
-
-UUID&
-UUID::operator= (std::string const & str)
+PBD::UUID&
+PBD::UUID::operator= (std::string const & str)
 {
         boost::uuids::string_generator gen;
         *((boost::uuids::uuid*) this) = gen (str);
@@ -31,7 +29,7 @@ UUID::operator= (std::string const & str)
 }
 
 std::string
-UUID::to_s () const
+PBD::UUID::to_s () const
 {
         return std::string ((const char*) data, size());
 }