From 627261da50cf268239b113c373e09902945b4b28 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 25 Nov 2006 16:35:56 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20by=20Vladim=C3=ADr=20Marek=20(neuron),?= =?UTF-8?q?=20part=20of=20bugfix=20#5298?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Solaris CC compiler choked on wrong .h prototypes for functions using 'const' arguments. --- extern/bFTGL/src/FTCharmap.cpp | 4 ++-- intern/ghost/intern/GHOST_System.cpp | 4 ++-- intern/iksolver/intern/IK_QJacobianSolver.cpp | 4 ++-- .../RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/extern/bFTGL/src/FTCharmap.cpp b/extern/bFTGL/src/FTCharmap.cpp index f2400eea0f6..00e8cfceca5 100644 --- a/extern/bFTGL/src/FTCharmap.cpp +++ b/extern/bFTGL/src/FTCharmap.cpp @@ -44,13 +44,13 @@ bool FTCharmap::CharMap( FT_Encoding encoding) } -unsigned int FTCharmap::GlyphListIndex( unsigned int characterCode ) +unsigned int FTCharmap::GlyphListIndex( const unsigned int characterCode ) { return charMap.find( characterCode); } -unsigned int FTCharmap::FontIndex( unsigned int characterCode ) +unsigned int FTCharmap::FontIndex( const unsigned int characterCode ) { return FT_Get_Char_Index( ftFace, characterCode); } diff --git a/intern/ghost/intern/GHOST_System.cpp b/intern/ghost/intern/GHOST_System.cpp index d04f13a13a4..d91658787b9 100644 --- a/intern/ghost/intern/GHOST_System.cpp +++ b/intern/ghost/intern/GHOST_System.cpp @@ -138,7 +138,7 @@ bool GHOST_System::validWindow(GHOST_IWindow* window) GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, - bool stereoVisual) + const bool stereoVisual) { GHOST_TSuccess success = GHOST_kFailure; GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager") @@ -310,7 +310,7 @@ GHOST_TSuccess GHOST_System::exit() } -GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, bool stereoVisual) +GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual) { GHOST_TSuccess success; GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager") diff --git a/intern/iksolver/intern/IK_QJacobianSolver.cpp b/intern/iksolver/intern/IK_QJacobianSolver.cpp index 8ae836a7eb8..7cfdcccc2ad 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.cpp +++ b/intern/iksolver/intern/IK_QJacobianSolver.cpp @@ -178,8 +178,8 @@ bool IK_QJacobianSolver::UpdateAngles(MT_Scalar& norm) bool IK_QJacobianSolver::Solve( IK_QSegment *root, std::list tasks, - MT_Scalar, - int max_iterations + const MT_Scalar, + const int max_iterations ) { //double dt = analyze_time(); diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 5006506688a..c95258ddab7 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -529,7 +529,7 @@ bool RAS_OpenGLRasterizer::Stereo() } -void RAS_OpenGLRasterizer::SetEye(StereoEye eye) +void RAS_OpenGLRasterizer::SetEye(const StereoEye eye) { m_curreye = eye; switch (m_stereomode) @@ -574,7 +574,7 @@ RAS_IRasterizer::StereoEye RAS_OpenGLRasterizer::GetEye() } -void RAS_OpenGLRasterizer::SetEyeSeparation(float eyeseparation) +void RAS_OpenGLRasterizer::SetEyeSeparation(const float eyeseparation) { m_eyeseparation = eyeseparation; m_seteyesep = true; @@ -585,7 +585,7 @@ float RAS_OpenGLRasterizer::GetEyeSeparation() return m_eyeseparation; } -void RAS_OpenGLRasterizer::SetFocalLength(float focallength) +void RAS_OpenGLRasterizer::SetFocalLength(const float focallength) { m_focallength = focallength; m_setfocallength = true;