diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-11 19:19:04 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-07-12 20:42:29 +0300 |
| commit | 4014aa6721e53318e4ac92814776b3e01b4589cb (patch) | |
| tree | dd57dfb64f5db1a9afaf7ab94cfa9aaeaae1392b /src/mbgl/gl | |
| parent | 2fae373fc9da1a5ed61b5114d8c982073734826d (diff) | |
| download | qtlocation-mapboxgl-4014aa6721e53318e4ac92814776b3e01b4589cb.tar.gz | |
[core] GCC 4.9 bracket initialization issues
Diffstat (limited to 'src/mbgl/gl')
| -rw-r--r-- | src/mbgl/gl/uniform.hpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp index 829192bcca..4ed2419764 100644 --- a/src/mbgl/gl/uniform.hpp +++ b/src/mbgl/gl/uniform.hpp @@ -48,6 +48,8 @@ public: class State { public: + State(UniformLocation location_) : location(std::move(location_)) {} + void operator=(const Value& value) { if (location >= 0 && (!current || *current != value.t)) { current = value.t; @@ -106,7 +108,7 @@ public: template <class Program> static State loadNamedLocations(const Program& program) { - return State{ { program.uniformLocation(Us::name()) }... }; + return State(typename Us::State(program.uniformLocation(Us::name()))...); } static NamedLocations getNamedLocations(const State& state) { |