Use C++11 features with containers

[libs/gl.git] / source / glsl / reflect.cpp

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 91e8fa55dde940020c5255e97e48eb69abbf7afb..82ad244c1d7083c1ad8b61e4c22fee69e25e7f2f 100644 (file)
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include "reflect.h"
 
 using namespace std;
@@ -158,8 +159,8 @@ void TypeComparer::visit(StructDeclaration &strct)
                else
                {
                        r_result = true;
-                       NodeList<Statement>::const_iterator i = strct1->members.body.begin();
-                       NodeList<Statement>::const_iterator j = strct.members.body.begin();
+                       auto i = strct1->members.body.begin();
+                       auto j = strct.members.body.begin();
                        for(; (r_result && i!=strct1->members.body.end()); ++i, ++j)
                                compare(**i, **j);
                }
@@ -207,10 +208,10 @@ void LocationCounter::visit(ImageTypeDeclaration &)
 void LocationCounter::visit(StructDeclaration &strct)
 {
        unsigned total = 0;
-       for(NodeList<Statement>::const_iterator i=strct.members.body.begin(); i!=strct.members.body.end(); ++i)
+       for(const RefPtr<Statement> &s: strct.members.body)
        {
                r_count = 1;
-               (*i)->visit(*this);
+               s->visit(*this);
                total += r_count;
        }
        r_count = total;
@@ -256,12 +257,12 @@ void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
 {
        unsigned total = 0;
        unsigned max_align = 1;
-       for(NodeList<Statement>::iterator i=strct.members.body.begin(); i!=strct.members.body.end(); ++i)
+       for(const RefPtr<Statement> &s: strct.members.body)
        {
                r_size = 0;
                r_alignment = 1;
                r_offset = -1;
-               (*i)->visit(*this);
+               s->visit(*this);
                if(r_offset)
                        total = r_offset;
                total += r_alignment-1;
@@ -277,10 +278,9 @@ void MemoryRequirementsCalculator::visit(VariableDeclaration &var)
 {
        if(var.layout)
        {
-               const vector<Layout::Qualifier> qualifiers = var.layout->qualifiers;
-               for(vector<Layout::Qualifier>::const_iterator i=qualifiers.begin(); (r_offset<0 && i!=qualifiers.end()); ++i)
-                       if(i->name=="offset")
-                               r_offset = i->value;
+               auto i = find_member(var.layout->qualifiers, string("offset"), &Layout::Qualifier::name);
+               if(i!=var.layout->qualifiers.end())
+                       r_offset = i->value;
        }
 
        if(var.type_declaration)