From e2c1ca1487fc05d03760a88fe178dcfb67fb0997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Tue, 8 Sep 2015 13:21:52 +0200
Subject: [PATCH] Remove old std::to_string()-related MinGW workarounds.

---
 src/Magnum/AbstractShaderProgram.cpp |  8 ++++----
 src/Magnum/DebugOutput.cpp           |  6 +++---
 src/Magnum/Shader.cpp                | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Magnum/AbstractShaderProgram.cpp b/src/Magnum/AbstractShaderProgram.cpp
index 7e8f31aff..a11bc1cd2 100644
--- a/src/Magnum/AbstractShaderProgram.cpp
+++ b/src/Magnum/AbstractShaderProgram.cpp
@@ -38,7 +38,7 @@
 #include "Implementation/ShaderProgramState.h"
 #include "Implementation/State.h"
 
-#if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+#if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID)
 #include <sstream>
 #endif
 
@@ -354,7 +354,7 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
         message.resize(std::max(logLength, 1)-1);
 
         /** @todo Remove when this is fixed everywhere (also the include above) */
-        #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+        #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID)
         std::ostringstream converter;
         converter << i;
         #endif
@@ -366,7 +366,7 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
             out.setFlag(Debug::SpaceAfterEachValue, false);
             out << "AbstractShaderProgram::link(): linking";
             if(shaders.size() != 1) {
-                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
+                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
                 out << " of shader " << std::to_string(i);
                 #else
                 out << " of shader " << converter.str();
@@ -382,7 +382,7 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
             out.setFlag(Debug::SpaceAfterEachValue, false);
             out << "AbstractShaderProgram::link(): linking";
             if(shaders.size() != 1) {
-                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
+                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
                 out << " of shader " << std::to_string(i);
                 #else
                 out << " of shader " << converter.str();
diff --git a/src/Magnum/DebugOutput.cpp b/src/Magnum/DebugOutput.cpp
index d00cb4ed8..4d8b60860 100644
--- a/src/Magnum/DebugOutput.cpp
+++ b/src/Magnum/DebugOutput.cpp
@@ -34,7 +34,7 @@
 #include "Magnum/Implementation/State.h"
 #include "Magnum/Implementation/DebugState.h"
 
-#if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+#if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID)
 #include <sstream>
 #endif
 
@@ -106,13 +106,13 @@ void defaultCallback(const DebugOutput::Source source, const DebugOutput::Type t
     }
 
     /** @todo Remove when this is fixed everywhere (also the include above) */
-    #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+    #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID)
     std::ostringstream converter;
     converter << id;
     #endif
 
     output << '(' +
-        #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
+        #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
         std::to_string(id) +
         #else
         converter.str() +
diff --git a/src/Magnum/Shader.cpp b/src/Magnum/Shader.cpp
index 67bd206bf..ccdbdc3c3 100644
--- a/src/Magnum/Shader.cpp
+++ b/src/Magnum/Shader.cpp
@@ -39,7 +39,7 @@
 #include "Implementation/State.h"
 #include "Implementation/ShaderState.h"
 
-#if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+#if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID)
 #include <sstream>
 #endif
 
@@ -779,7 +779,7 @@ std::vector<std::string> Shader::sources() const { return _sources; }
 Shader& Shader::addSource(std::string source) {
     if(!source.empty()) {
         /** @todo Remove when newlib has this fixed (also the include above) */
-        #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+        #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID)
         std::ostringstream converter;
         converter << (_sources.size()+1)/2;
         #endif
@@ -787,7 +787,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 " +
-            #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
+            #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
             std::to_string((_sources.size()+1)/2) +
             #else
             converter.str() +
@@ -849,7 +849,7 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
         message.resize(std::max(logLength, 1)-1);
 
         /** @todo Remove when this is fixed everywhere (also the include above) */
-        #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+        #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID)
         std::ostringstream converter;
         converter << i;
         #endif
@@ -862,7 +862,7 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
             out << "Shader::compile(): compilation of " << shaderName(shader._type)
                 << " shader";
             if(shaders.size() != 1) {
-                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
+                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
                 out << " " << std::to_string(i);
                 #else
                 out << " " << converter.str();
@@ -879,7 +879,7 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
             out << "Shader::compile(): compilation of " << shaderName(shader._type)
                 << " shader";
             if(shaders.size() != 1) {
-                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
+                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID)
                 out << " " << std::to_string(i);
                 #else
                 out << " " << converter.str();