[colobot] 37/74: Remove default lambda parameters

Didier Raboud odyx at moszumanska.debian.org
Mon Nov 7 07:50:03 UTC 2016


This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 92b1e544ecb0220af88ad896e4e3abee4ef9c9c1
Author: MrSimbax <mateuszprzybyl at simbax.info>
Date:   Thu Aug 18 10:02:54 2016 +0200

    Remove default lambda parameters
    
    They cause compilation error on MSVC and should give errors, as it's explicitly stated in the C++11 standard: http://stackoverflow.com/questions/6281472/why-does-a-default-argument-for-a-lambda-argument-trigger-a-pedantic-gcc-warni
---
 src/graphics/engine/engine.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp
index 7e5d4a8..5c4a317 100644
--- a/src/graphics/engine/engine.cpp
+++ b/src/graphics/engine/engine.cpp
@@ -5057,7 +5057,7 @@ void CEngine::DrawStats()
 
     SetState(ENG_RSTATE_TEXT);
 
-    auto drawStatsLine = [&](const std::string& name = "", const std::string& value = "", const std::string& value2 = "")
+    auto drawStatsLine = [&](const std::string& name, const std::string& value, const std::string& value2)
     {
         if (!name.empty())
             m_text->DrawText(name+":", FONT_COLOBOT, 12.0f, pos, 1.0f, TEXT_ALIGN_LEFT, 0, Color(1.0f, 1.0f, 1.0f, 1.0f));
@@ -5103,14 +5103,14 @@ void CEngine::DrawStats()
                             CProfiler::GetPerformanceCounterTime(PCNT_RENDER_SHADOW_MAP);
 
     drawStatsCounter("Event processing", PCNT_EVENT_PROCESSING);
-    drawStatsLine(   "");
+    drawStatsLine(   "", "", "");
     drawStatsCounter("Frame update",      PCNT_UPDATE_ALL);
     drawStatsValue  ("    Engine update",     engineUpdate);
     drawStatsCounter("    Particle update",   PCNT_UPDATE_PARTICLE);
     drawStatsValue  ("    Game update",       gameUpdate);
     drawStatsCounter("    CBot programs",     PCNT_UPDATE_CBOT);
     drawStatsValue(  "    Other update",      otherUpdate);
-    drawStatsLine(   "");
+    drawStatsLine(   "", "", "");
     drawStatsCounter("Frame render",      PCNT_RENDER_ALL);
     drawStatsCounter("    Particle render",   PCNT_RENDER_PARTICLE_WORLD);
     drawStatsCounter("    Water render",      PCNT_RENDER_WATER);
@@ -5121,13 +5121,13 @@ void CEngine::DrawStats()
     drawStatsCounter("    Shadow map render", PCNT_RENDER_SHADOW_MAP);
     drawStatsValue(  "    Other render",      otherRender);
     drawStatsCounter("Swap buffers & VSync",  PCNT_SWAP_BUFFERS);
-    drawStatsLine(   "");
-    drawStatsLine(   "Triangles",         StrUtils::ToString<int>(m_statisticTriangle));
-    drawStatsLine(   "FPS",               StrUtils::Format("%.3f", m_fps));
-    drawStatsLine(   "");
+    drawStatsLine(   "", "", "");
+    drawStatsLine(   "Triangles",         StrUtils::ToString<int>(m_statisticTriangle), "");
+    drawStatsLine(   "FPS",               StrUtils::Format("%.3f", m_fps), "");
+    drawStatsLine(   "", "", "");
     std::stringstream str;
     str << std::fixed << std::setprecision(2) << m_statisticPos.x << "; " << m_statisticPos.z;
-    drawStatsLine(   "Position",          str.str());
+    drawStatsLine(   "Position",          str.str(), "");
 }
 
 void CEngine::DrawTimer()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git



More information about the Pkg-games-commits mailing list