ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove old std::to_string()-related MinGW workarounds.

pull/107/head
Vladimír Vondruš 11 years ago
parent
d971d388c2
commit
e2c1ca1487
3 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/Magnum/AbstractShaderProgram.cpp
  2. 6
      src/Magnum/DebugOutput.cpp
  3. 12
      src/Magnum/Shader.cpp

8
src/Magnum/AbstractShaderProgram.cpp
Unescape View File

@ -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();

6
src/Magnum/DebugOutput.cpp
Unescape View File

@ -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() +

12
src/Magnum/Shader.cpp
Unescape View File

@ -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();

Write Preview
Loading…
Cancel
Save