From a668ebe68b4dc0bf9995957b97de83dd6c0cc372 Mon Sep 17 00:00:00 2001
From: Darryl Pogue <dvpdiner2@gmail.com>
Date: Sat, 6 Aug 2011 14:41:10 -0700
Subject: [PATCH] Make plUUID work in *nix.

---
 Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt  |  2 ++
 Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp | 11 ++---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt b/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt
index 905ab2ac..99eaca4c 100644
--- a/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt
+++ b/Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt
@@ -8,6 +8,8 @@ set(plUUID_SOURCES
 
 if(WIN32)
     set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Win32.cpp)
+else(WIN32)
+    set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Unix.cpp)
 endif(WIN32)
 
 set(plUUID_HEADERS
diff --git a/Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp b/Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp
index a709bbfd..b3e83b5b 100644
--- a/Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp
+++ b/Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp
@@ -90,7 +90,7 @@ bool plUUID::FromString( const char * str )
     return true;
 }
 
-bool plUUID::ToString( std::string & out ) const
+bool plUUID::ToStdString( std::string & out ) const
 {
     uuid_t g;
     plUUIDHelper::CopyToNative( g, this );
@@ -100,13 +100,6 @@ bool plUUID::ToString( std::string & out ) const
     return true;
 }
 
-std::string plUUID::ToString() const
-{
-    std::string str;
-    plUUID::ToString( str );
-    return str;
-}
-
 // static
 plUUID plUUID::Generate()
 {
@@ -125,4 +118,4 @@ void _preventLNK4221WarningStub()
 {
 }
 
-#endif
\ No newline at end of file
+#endif