X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsourcemap.cpp;h=6c4dd476289736e7778f2cc3d371f7980efd2f60;hp=9b341fe46e0b6be0c098199548de39a3a4b28f10;hb=HEAD;hpb=1083ad150c902bd153f88f7fb28660b4f31cf9fe diff --git a/source/glsl/sourcemap.cpp b/source/glsl/sourcemap.cpp index 9b341fe4..6c4dd476 100644 --- a/source/glsl/sourcemap.cpp +++ b/source/glsl/sourcemap.cpp @@ -9,11 +9,7 @@ namespace Msp { namespace GL { namespace SL { -SourceMap::SourceMap(): - base_index(0) -{ } - -void SourceMap::set_name(unsigned i, const std::string &n) +void SourceMap::set_name(unsigned i, const string &n) { if(source_names.empty()) base_index = i; @@ -59,9 +55,9 @@ string SourceMap::translate_errors(const string &errors) const static const Regex r_message("^(([0-9]+)\\(([0-9]+)\\) :|ERROR: ([0-9]+):([0-9]+):) (.*)$"); vector lines = split(errors, '\n'); string translated; - for(vector::const_iterator i=lines.begin(); i!=lines.end(); ++i) + for(const string &l: lines) { - RegMatch m = r_message.match(*i); + RegMatch m = r_message.match(l); if(m) { unsigned index = 0; @@ -82,7 +78,7 @@ string SourceMap::translate_errors(const string &errors) const translated += format("%s:%d: %s", src, line, m[6].str); } else - translated += *i; + translated += l; translated += '\n'; }