Browse Source

Make plUUID work in *nix.

Darryl Pogue 14 years ago
parent
commit
a668ebe68b
  1. 2
      Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt
  2. 9
      Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp

2
Sources/Plasma/PubUtilLib/plUUID/CMakeLists.txt

@ -8,6 +8,8 @@ set(plUUID_SOURCES
if(WIN32) if(WIN32)
set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Win32.cpp) set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Win32.cpp)
else(WIN32)
set(plUUID_SOURCES ${plUUID_SOURCES} plUUID_Unix.cpp)
endif(WIN32) endif(WIN32)
set(plUUID_HEADERS set(plUUID_HEADERS

9
Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp

@ -90,7 +90,7 @@ bool plUUID::FromString( const char * str )
return true; return true;
} }
bool plUUID::ToString( std::string & out ) const bool plUUID::ToStdString( std::string & out ) const
{ {
uuid_t g; uuid_t g;
plUUIDHelper::CopyToNative( g, this ); plUUIDHelper::CopyToNative( g, this );
@ -100,13 +100,6 @@ bool plUUID::ToString( std::string & out ) const
return true; return true;
} }
std::string plUUID::ToString() const
{
std::string str;
plUUID::ToString( str );
return str;
}
// static // static
plUUID plUUID::Generate() plUUID plUUID::Generate()
{ {

Loading…
Cancel
Save