OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-17 18:59:09 +00:00
Code Releases Activity

Make plUUID work in *nix.

Browse Source
This commit is contained in:
Darryl Pogue
2011-08-06 14:41:10 -07:00
parent 77bd6397ae
commit a668ebe68b
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

11
Sources/Plasma/PubUtilLib/plUUID/plUUID_Unix.cpp
View File

@ -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()
{ {
@ -125,4 +118,4 @@ void _preventLNK4221WarningStub()
{ {
} }
#endif #endif