Patch by Vladimír Marek (neuron), part of bugfix #5298

Solaris CC compiler choked on wrong .h prototypes for functions using
'const' arguments.

diff --git a/extern/bFTGL/src/FTCharmap.cpp b/extern/bFTGL/src/FTCharmap.cpp
index f2400eea0f6a33a542a6941f0bc44cefa7cef8a2..00e8cfceca568cfb517f00f3dbdf433599d66f0e 100644 (file)
--- 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 d04f13a13a4045b833fe9861f6a962e2ed3b80fb..d91658787b96209288ab2d699dedbee8dc631cca 100644 (file)
--- 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 8ae836a7eb8ac5715cf202ead0d8df64c00906a4..7cfdcccc2ad8687ea60ebd925190bcf73a8877f4 100644 (file)
--- 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<IK_QTask*> 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 5006506688a6eab84fb0eacdf04b7123cb232f7b..c95258ddab747a90a788a2c27edc6b03e14c786b 100644 (file)
--- 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;