Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes for MIPSpro SGI compiler

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-09-19 16:06:20 +00:00
parent e752575a1f
commit 11e82c1ba3
2 changed files with 489 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/geometry.h
View File

@@ -1,11 +1,11 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: geometry.h // Name: wx/geometry.h
// Purpose: Common Geometry Classes // Purpose: Common Geometry Classes
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 08/05/99 // Created: 08/05/99
// RCS-ID: // RCS-ID:
// Copyright: (c) // Copyright: (c) 1999 Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -474,8 +474,9 @@ inline wxPoint2DInt::wxPoint2DInt( const wxPoint &pt )
inline void wxPoint2DInt::GetFloor( wxInt32 *x , wxInt32 *y ) inline void wxPoint2DInt::GetFloor( wxInt32 *x , wxInt32 *y )
{ {
*x = (wxInt32) floor( m_x ) ; // casts needed MIPSpro compiler under SGI
*y = (wxInt32) floor( m_y ) ; *x = (wxInt32) floor( (double)m_x );
*y = (wxInt32) floor( (double)m_y );
} }
inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y ) inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y )
@@ -486,7 +487,8 @@ inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y )
inline wxDouble wxPoint2DInt::GetVectorLength() inline wxDouble wxPoint2DInt::GetVectorLength()
{ {
return sqrt( (m_x)*(m_x) + (m_y)*(m_y) ) ; // casts needed MIPSpro compiler under SGI
return sqrt( (double)(m_x)*(m_x) + (m_y)*(m_y) );
} }
inline void wxPoint2DInt::SetVectorLength( wxDouble length ) inline void wxPoint2DInt::SetVectorLength( wxDouble length )

8
src/common/geometry.cpp
View File

@@ -1,11 +1,11 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: geometry.h // Name: common/geometry.cpp
// Purpose: Common Geometry Classes // Purpose: Common Geometry Classes
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
// Created: 08/05/99 // Created: 08/05/99
// RCS-ID: // RCS-ID:
// Copyright: (c) // Copyright: (c) 1999 Stefan Csomor
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -176,7 +176,9 @@ wxDouble wxPoint2DInt::GetVectorAngle()
else else
return 180; return 180;
} }
wxDouble deg = atan2( m_y , m_x ) * 180 / 3.14159265359 ;
// casts needed MIPSpro compiler under SGI
wxDouble deg = atan2( (double)m_y , (double)m_x ) * 180 / 3.14159265359;
if ( deg < 0 ) if ( deg < 0 )
{ {
deg += 360; deg += 360;