OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Fix pnUUID compilation on Linux

Browse Source
This commit is contained in:
Michael Hansen
2012-02-09 21:29:23 -08:00
parent 77cd055a27
commit 247749934b
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -1129,8 +1129,8 @@ void StatusCallback(void *param)
} }
} }
delete [] statusUrl;
curl_easy_cleanup(hCurl); curl_easy_cleanup(hCurl);
delete [] statusUrl;
s_statusEvent.Signal(); s_statusEvent.Signal();
} }

2
Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
View File

@ -74,7 +74,7 @@ public:
int CompareTo( const plUUID * v ) const; int CompareTo( const plUUID * v ) const;
bool IsEqualTo( const plUUID * v ) const; bool IsEqualTo( const plUUID * v ) const;
bool FromString( const char * str ); bool FromString( const char * str );
bool FromString( const plString & str ); bool FromString( const plString & str ) { return FromString( str.c_str() ); }
bool ToString( plString & out ) const; bool ToString( plString & out ) const;
plString AsString() const; plString AsString() const;
void Read( hsStream * s ); void Read( hsStream * s );

5
Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
View File

@ -88,11 +88,6 @@ bool plUUID::FromString( const char * str )
return RPC_S_OK == UuidFromString( (unsigned char *)str, (GUID *)this ); return RPC_S_OK == UuidFromString( (unsigned char *)str, (GUID *)this );
} }
bool plUUID::FromString( const plString & str )
{
return FromString( str.c_str() );
}
bool plUUID::ToString( plString & out ) const bool plUUID::ToString( plString & out ) const
{ {
out = _TEMP_CONVERT_FROM_LITERAL(""); out = _TEMP_CONVERT_FROM_LITERAL("");