OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code Packages Releases Activity

0022899: Thread-safety in Standard_GUID

Browse Source
This commit is contained in:
RLN 2012-01-27 13:43:57 +00:00 committed by bugmaster
parent 5cbef0feb7
commit 6b09c923a9
1 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Standard/Standard_GUID.cxx
View File

@ -210,12 +210,9 @@ Standard_GUID::Standard_GUID(const Standard_ExtString aGuid)
my8b5 ( 0), my8b5 ( 0),
my8b6 ( 0) my8b6 ( 0)
{ {
static char tpb[Standard_GUID_SIZE_ALLOC]; char tpb[Standard_GUID_SIZE_ALLOC];
char *tmpBuffer; char *tmpBuffer = tpb;
Standard_Integer i = 0; Standard_Integer i = 0;
tmpBuffer = tpb;
while(i < Standard_GUID_SIZE) { while(i < Standard_GUID_SIZE) {
tmpBuffer[i] = (char ) aGuid[i]; tmpBuffer[i] = (char ) aGuid[i];
i++; i++;
@ -326,14 +323,9 @@ void Standard_GUID::ToCString(const Standard_PCharacter aStrGuid) const
void Standard_GUID::ToExtString(const Standard_PExtCharacter aStrGuid) const void Standard_GUID::ToExtString(const Standard_PExtCharacter aStrGuid) const
{ {
Standard_Character sguid[Standard_GUID_SIZE_ALLOC]; Standard_Character sguid[Standard_GUID_SIZE_ALLOC];
Standard_PCharacter pStr; ToCString(sguid);
Standard_Integer i;
//
pStr=sguid;
ToCString(pStr); for(Standard_Integer i = 0; i < Standard_GUID_SIZE; i++) {
for(i = 0; i < Standard_GUID_SIZE; i++) {
aStrGuid[i] = (Standard_ExtCharacter)sguid[i]; aStrGuid[i] = (Standard_ExtCharacter)sguid[i];
} }
@ -398,21 +390,13 @@ void Standard_GUID::Assign(const Standard_GUID& uid)
void Standard_GUID::ShallowDump(Standard_OStream& aStream) const void Standard_GUID::ShallowDump(Standard_OStream& aStream) const
{ {
Standard_Character sguid[Standard_GUID_SIZE_ALLOC]; Standard_Character sguid[Standard_GUID_SIZE_ALLOC];
Standard_PCharacter pC; ToCString(sguid);
//
pC=sguid;
ToCString(pC);
aStream << sguid; aStream << sguid;
} }
Standard_Integer Standard_GUID::HashCode(const Standard_GUID& aGuid,const Standard_Integer Upper) Standard_Integer Standard_GUID::HashCode(const Standard_GUID& aGuid,const Standard_Integer Upper)
{ {
Standard_Integer result; return aGuid.Hash(Upper);
result = aGuid.Hash(Upper);
return result;
} }
Standard_Integer Standard_GUID::Hash(const Standard_Integer Upper) const Standard_Integer Standard_GUID::Hash(const Standard_Integer Upper) const
@ -422,15 +406,10 @@ Standard_Integer Standard_GUID::Hash(const Standard_Integer Upper) const
Raise("Standard_GUID::Hash: Try to apply HashCode method with negative or null argument."); Raise("Standard_GUID::Hash: Try to apply HashCode method with negative or null argument.");
} }
Standard_Integer result; char sguid[Standard_GUID_SIZE_ALLOC];
static char tmpchar[Standard_GUID_SIZE_ALLOC]; ToCString(sguid);
Standard_PCharacter pC;
pC=tmpchar;
ToCString(pC);
result = ::HashCode(tmpchar,Upper); return ::HashCode(sguid,Upper);
return result;
} }
Standard_Boolean Standard_GUID::IsEqual(const Standard_GUID& aGuid1,const Standard_GUID& aGuid2) Standard_Boolean Standard_GUID::IsEqual(const Standard_GUID& aGuid1,const Standard_GUID& aGuid2)