OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +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

4
src/Aspect/Aspect_CircularGrid.cxx
View File

@@ -71,7 +71,7 @@ void Aspect_CircularGrid::Compute(const Quantity_Length X,
Standard_Real cosinus = (X-xo)/d;
Standard_Real a = ACos(cosinus);
Standard_Real ra = RotationAngle();
if ( Y < yo ) a = 2*Standard_PI - a;
if ( Y < yo ) a = 2 * M_PI - a;
#ifdef OCC192_193
n = (Standard_Integer ) ((a-ra)/myAlpha + Sign(0.5, a-ra)) ;
#else
@@ -149,6 +149,6 @@ return myDivisionNumber;
}
void Aspect_CircularGrid::Init () {
myAlpha = Standard_PI /Standard_Real(myDivisionNumber);
myAlpha = M_PI / Standard_Real(myDivisionNumber);
myA1 = Cos(myAlpha); myB1=Sin(myAlpha);
}

18
src/Aspect/Aspect_MarkerStyle.cxx
View File

@@ -252,7 +252,7 @@ void Aspect_MarkerStyle::SetPredefinedStyle() {
MySpoint = new TColStd_HArray1OfBoolean(1,MAX_O_POINT+1) ;
{ Standard_Integer i;
Standard_Real da = 2.*Standard_PI/MAX_O_POINT;
Standard_Real da = 2. * M_PI / MAX_O_POINT;
Standard_Real a = 0.;
for( i=1 ; i<= MAX_O_POINT+1 ; i++,a += da ) {
MyXpoint->SetValue(i,(float ) Cos(a));
@@ -290,7 +290,7 @@ void Aspect_MarkerStyle::SetPredefinedStyle() {
MyYpoint = new TShort_HArray1OfShortReal(1,MAX_O_POINT+6) ;
MySpoint = new TColStd_HArray1OfBoolean(1,MAX_O_POINT+6) ;
{ Standard_Integer i;
Standard_Real da = 2.*Standard_PI/MAX_O_POINT;
Standard_Real da = 2. * M_PI / MAX_O_POINT;
Standard_Real a = 0.;
for( i=1 ; i<= MAX_O_POINT+1 ; i++,a += da ) {
MyXpoint->SetValue(i,(float ) Cos(a));
@@ -328,7 +328,7 @@ void Aspect_MarkerStyle::SetPredefinedStyle() {
MySpoint = new TColStd_HArray1OfBoolean(1,MAX_O_POINT+5) ;
{ Standard_Integer i;
Standard_Real da = 2.*Standard_PI/MAX_O_POINT;
Standard_Real da = 2. * M_PI / MAX_O_POINT;
Standard_Real a = 0.;
for( i=1 ; i<= MAX_O_POINT+1 ; i++,a += da ) {
MyXpoint->SetValue(i,(float ) Cos(a));
@@ -362,7 +362,7 @@ void Aspect_MarkerStyle::SetPredefinedStyle() {
MySpoint = new TColStd_HArray1OfBoolean(1,MAX_O_POINT+9) ;
{ Standard_Integer i;
Standard_Real da = 2.*Standard_PI/MAX_O_POINT;
Standard_Real da = 2. * M_PI / MAX_O_POINT;
Standard_Real a = 0.;
for( i=1 ; i<= MAX_O_POINT+1 ; i++,a += da ) {
MyXpoint->SetValue(i,(float ) Cos(a));
@@ -412,7 +412,7 @@ void Aspect_MarkerStyle::SetPredefinedStyle() {
MySpoint = new TColStd_HArray1OfBoolean(1,MAX_O_POINT+5) ;
{ Standard_Integer i;
Standard_Real da = 2.*Standard_PI/MAX_O_POINT;
Standard_Real da = 2. * M_PI / MAX_O_POINT;
Standard_Real a = 0.;
for( i=1 ; i<= MAX_O_POINT+1 ; i++,a += da ) {
MyXpoint->SetValue(i,(float ) Cos(a));
@@ -449,7 +449,7 @@ void Aspect_MarkerStyle::SetPredefinedStyle() {
MAX_BALL_LINE*(MAX_O_POINT+1)) ;
{ Standard_Integer i,j,n = 0;
Standard_Real da = 2.*Standard_PI/MAX_O_POINT;
Standard_Real da = 2. * M_PI / MAX_O_POINT;
Standard_Real dr = 1./MAX_BALL_LINE;
Standard_Real a,r = 1.;
@@ -476,7 +476,7 @@ void Aspect_MarkerStyle::SetPredefinedStyle() {
(MAX_BALL_LINE/4)*(MAX_O_POINT+1)) ;
{ Standard_Integer i,j,n = 0;
Standard_Real da = 2.*Standard_PI/MAX_O_POINT;
Standard_Real da = 2. * M_PI / MAX_O_POINT;
Standard_Real dr = 1./MAX_BALL_LINE;
Standard_Real a,r = 1.;
@@ -503,7 +503,7 @@ void Aspect_MarkerStyle::SetPredefinedStyle() {
(MAX_BALL_LINE/3)*(MAX_O_POINT+1)) ;
{ Standard_Integer i,j,n = 0;
Standard_Real da = 2.*Standard_PI/MAX_O_POINT;
Standard_Real da = 2. * M_PI / MAX_O_POINT;
Standard_Real dr = 1./MAX_BALL_LINE;
Standard_Real a,r = 1.;
@@ -530,7 +530,7 @@ void Aspect_MarkerStyle::SetPredefinedStyle() {
(MAX_BALL_LINE)/2*(MAX_O_POINT+1)) ;
{ Standard_Integer i,j,n = 0;
Standard_Real da = 2.*Standard_PI/MAX_O_POINT;
Standard_Real da = 2. * M_PI / MAX_O_POINT;
Standard_Real dr = 1./MAX_BALL_LINE;
Standard_Real a,r = 1.;

12
src/Aspect/Aspect_RectangularGrid.cxx
View File

@@ -126,8 +126,8 @@ void Aspect_RectangularGrid::Init () {
// b1 = Sin (myFirstAngle + RotationAngle() );
// c1 = XOrigin() * b1 - YOrigin() * a1;
//
// a2 = Cos (mySecondAngle + RotationAngle() + Standard_PI/2.);
// b2 = Sin (mySecondAngle + RotationAngle() + Standard_PI/2.);
// a2 = Cos (mySecondAngle + RotationAngle() + M_PI / 2.);
// b2 = Sin (mySecondAngle + RotationAngle() + M_PI / 2.);
// c2 = XOrigin() * b2 - YOrigin() * a2;
#ifdef CSR577
@@ -142,7 +142,7 @@ void Aspect_RectangularGrid::Init () {
}
if ( angle2 != 0. ) {
angle2 += Standard_PI/2.;
angle2 += M_PI / 2.;
a2 = -Sin (angle2);
b2 = Cos (angle2);
c2 = XOrigin() * b2 - YOrigin() * a2;
@@ -154,8 +154,8 @@ void Aspect_RectangularGrid::Init () {
b1 = Cos (myFirstAngle + RotationAngle());
c1 = XOrigin() * b1 - YOrigin() * a1;
a2 = -Sin (mySecondAngle + RotationAngle() + Standard_PI/2.);
b2 = Cos (mySecondAngle + RotationAngle() + Standard_PI/2.);
a2 = -Sin (mySecondAngle + RotationAngle() + M_PI / 2.);
b2 = Cos (mySecondAngle + RotationAngle() + M_PI / 2.);
c2 = XOrigin() * b2 - YOrigin() * a2;
#endif
//-zov
@@ -163,7 +163,7 @@ void Aspect_RectangularGrid::Init () {
Standard_Boolean Aspect_RectangularGrid::CheckAngle(const Standard_Real alpha,
const Standard_Real beta) const {
return (Abs( Sin(alpha) * Cos(beta+Standard_PI/2.) - Cos(alpha) * Sin(beta+Standard_PI/2.)) != 0) ;
return (Abs( Sin(alpha) * Cos(beta + M_PI / 2.) - Cos(alpha) * Sin(beta + M_PI / 2.)) != 0) ;
}