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

Remove all uses of GuidToString.

Browse Source
This commit is contained in:
Darryl Pogue
2012-12-15 21:33:14 -08:00
parent 517d4f6788
commit 274812c057
18 changed files with 34 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/NucleusLib/pnUUID/CMakeLists.txt
View File

@ -7,10 +7,12 @@ set(pnUUID_SOURCES
if(WIN32)
set(pnUUID_SOURCES ${pnUUID_SOURCES} pnUUID_Win32.cpp)
else(WIN32)
set(pnUUID_SOURCES ${pnUUID_SOURCES} pnUUID_Unix.cpp)
endif(WIN32)
if(UNIX)
set(pnUUID_SOURCES ${pnUUID_SOURCES} pnUUID_Unix.cpp)
endif(UNIX)
set(pnUUID_HEADERS
pnUUID.h
)

11
Sources/Plasma/NucleusLib/pnUUID/pnUUID.cpp
View File

@ -47,12 +47,7 @@ plUUID::plUUID()
Clear();
}
plUUID::plUUID(const plString & s)
{
FromString(s);
}
plUUID::plUUID(const char * s)
plUUID::plUUID(const plString& s)
{
FromString(s.c_str());
}
@ -67,13 +62,13 @@ plUUID::plUUID(const Uuid& uuid)
memcpy(fData, uuid.data, sizeof(fData));
}
void plUUID::Read(hsStream * s)
void plUUID::Read(hsStream* s)
{
s->LogSubStreamPushDesc("plUUID");
s->Read(sizeof(fData), (void*)fData);
}
void plUUID::Write(hsStream * s)
void plUUID::Write(hsStream* s)
{
s->Write(sizeof(fData), (const void*)fData);
}

8
Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp
View File

@ -126,12 +126,4 @@ plUUID plUUID::Generate()
return result;
}
#else
// dummy function to prevent a linker warning complaining about no public symbols if the
// contents of the file get compiled out via pre-processor
void _preventLNK4221WarningStub()
{
}
#endif