OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-08 14:17:06 +03:00
Code Activity

0022792: Globally defined symbol PI conflicts with VTK definition (Intel compiler)

Browse Source
This commit is contained in:
DBV
2011-12-16 08:50:03 +00:00
committed by bugmaster
parent bc650d4170
commit c6541a0c86
438 changed files with 2142 additions and 2188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Xw/Xw_Extension.h
View File

@@ -34,11 +34,7 @@
#define max(a,b) (a<b ? b : a)
#endif
#ifndef PI
#define PI 3.14159
#endif
#define DRAD (PI/180.)
#define DRAD (M_PI/180.)
#define MAXLINES 256
#define MAXPOLYS 256

8
src/Xw/Xw_draw_buffer.cxx
View File

@@ -1639,9 +1639,9 @@ float a,cosa,sina ;
pltextlist->upoints[i].y = (short int )( yp + YROTATE(x,y) );
a = pltextlist->rangles[i] + angle ;
if( a > 0. ) {
while( a > 2.*PI ) a -= 2.*PI ;
while( a > 2.*M_PI ) a -= 2.*M_PI ;
} else if( a < 0. ) {
while( a < -2.*PI ) a += 2.*PI ;
while( a < -2.*M_PI ) a += 2.*M_PI ;
}
pltextlist->uangles[i] = a ;
pltextlist->uscalex[i] = pltextlist->rscalex[i] ;
@@ -1661,9 +1661,9 @@ float a,cosa,sina ;
pptextlist->upoints[i].y = (short int )( yp + YROTATE(x,y) );
a = pptextlist->rangles[i] + angle ;
if( a > 0. ) {
while( a > 2.*PI ) a -= 2.*PI ;
while( a > 2.*M_PI ) a -= 2.*M_PI ;
} else if( a < 0. ) {
while( a < -2.*PI ) a += 2.*PI ;
while( a < -2.*M_PI ) a += 2.*M_PI ;
}
pptextlist->uangles[i] = a ;
pptextlist->uscalex[i] = pptextlist->rscalex[i] ;

4
src/Xw/Xw_draw_polytext.cxx
View File

@@ -126,9 +126,9 @@ XW_ATTRIB textcode;
ptextlist->slants[ntext] = 0. ;
strcpy(ptextlist->ptexts[ntext],text) ;
if( angle > 0. ) {
while( angle > 2.*PI ) angle -= 2.*PI ;
while( angle > 2.*M_PI ) angle -= 2.*M_PI ;
} else if( angle < 0. ) {
while( angle < -2.*PI ) angle += 2.*PI ;
while( angle < -2.*M_PI ) angle += 2.*M_PI ;
}
ptextlist->rangles[ntext] = angle ;
ptextlist->marges[ntext] = marge ;

4
src/Xw/Xw_draw_text.cxx
View File

@@ -117,9 +117,9 @@ XW_ATTRIB textcode;
ptextlist->slants[ntext] = 0. ;
strcpy(ptextlist->ptexts[ntext],text) ;
if( angle > 0. ) {
while( angle > 2.*PI ) angle -= 2.*PI ;
while( angle > 2.*M_PI ) angle -= 2.*M_PI ;
} else if( angle < 0. ) {
while( angle < -2.*PI ) angle += 2.*PI ;
while( angle < -2.*M_PI ) angle += 2.*M_PI ;
}
ptextlist->rangles[ntext] = angle ;