1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00

0024252: GCC warnings on breakage of strict-aliasing rules

Fixed type casts in NCollection maps
Avoid invalid type cast in handling of LDOM text object
Use correct pointer type in callback function of Graphic3d_CGraduatedTrihedron class
Format of printf() simplified in IntPatch_Point.cxx
This commit is contained in:
abv
2014-01-15 06:40:18 +04:00
committed by bugmaster
parent 504a896866
commit fd03ee4b3b
10 changed files with 49 additions and 113 deletions

View File

@@ -197,13 +197,10 @@ template < class TheKeyType,
//! ReSize
void ReSize (const Standard_Integer N)
{
IndexedDataMapNode** ppNewData1 = NULL;
IndexedDataMapNode** ppNewData2 = NULL;
NCollection_ListNode** ppNewData1 = NULL;
NCollection_ListNode** ppNewData2 = NULL;
Standard_Integer newBuck;
if (BeginResize (N, newBuck,
(NCollection_ListNode**&)ppNewData1,
(NCollection_ListNode**&)ppNewData2,
this->myAllocator))
if (BeginResize (N, newBuck, ppNewData1, ppNewData2, this->myAllocator))
{
if (myData1)
{
@@ -220,7 +217,7 @@ template < class TheKeyType,
iK2 = ::HashCode (p->Key2(), newBuck);
q = (IndexedDataMapNode*) p->Next();
p->Next() = ppNewData1[iK1];
p->Next2() = ppNewData2[iK2];
p->Next2() = (IndexedDataMapNode*)ppNewData2[iK2];
ppNewData1[iK1] = p;
ppNewData2[iK2] = p;
p = q;
@@ -228,10 +225,7 @@ template < class TheKeyType,
}
}
}
EndResize(N,newBuck,
(NCollection_ListNode**&)ppNewData1,
(NCollection_ListNode**&)ppNewData2,
this->myAllocator);
EndResize (N, newBuck, ppNewData1, ppNewData2, this->myAllocator);
}
}