From 706560fb28977e6ea7354609279c2a261c11c51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 23 Jul 2013 12:31:02 +0200 Subject: [PATCH] Mingw32's GCC 4.7 doesn't have std::to_string(). --- src/Shader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Shader.cpp b/src/Shader.cpp index 5b12c8b03..47063e848 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -27,7 +27,7 @@ #include #include -#ifdef CORRADE_TARGET_NACL_NEWLIB +#if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(_WIN32) #include #endif @@ -106,7 +106,7 @@ Shader& Shader::operator=(Shader&& other) { Shader& Shader::addSource(std::string source) { if(!source.empty()) { - #ifdef CORRADE_TARGET_NACL_NEWLIB + #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(_WIN32) std::ostringstream converter; converter << (sources.size()+1)/2; #endif @@ -114,7 +114,7 @@ Shader& Shader::addSource(std::string source) { /* Fix line numbers, so line 41 of third added file is marked as 3(41). Source 0 is the #version string added in constructor. */ sources.push_back("#line 1 " + - #ifndef CORRADE_TARGET_NACL_NEWLIB + #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(_WIN32) std::to_string((sources.size()+1)/2) + #else converter.str() +