From 2c97326d8d7bb232cc599d277355089522c045af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 2 Dec 2013 14:42:25 +0100 Subject: [PATCH] std::fstream accepts filename as std::string in C++11. Finally. --- src/Plugins/TgaImporter/TgaImporter.cpp | 2 +- src/Shader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/Plugins/TgaImporter/TgaImporter.cpp index 201939127..b4c55ef76 100644 --- a/src/Plugins/TgaImporter/TgaImporter.cpp +++ b/src/Plugins/TgaImporter/TgaImporter.cpp @@ -59,7 +59,7 @@ void TgaImporter::doOpenData(const Containers::ArrayReferencegood()) return; Error() << "Trade::TgaImporter::openFile(): cannot open file" << filename; diff --git a/src/Shader.cpp b/src/Shader.cpp index 4993c0f4b..e3a334c1b 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -605,7 +605,7 @@ Shader& Shader::addSource(std::string source) { Shader& Shader::addFile(const std::string& filename) { /* Open file */ - std::ifstream file(filename.c_str()); + std::ifstream file(filename); CORRADE_ASSERT(file.good(), "Shader file " << '\'' + filename + '\'' << " cannot be opened.", *this); /* Get size of shader and initialize buffer */