Merge pull request #138 from dekimir/fix-old-msvc

Fix #137 by avoiding a C++11 feature.

Merge pull request #138 from dekimir/fix-old-msvc
dd1c2235 · John Kessenich · aa52beb8 · 97605c86 · dd1c2235
Commit dd1c2235 authored Jan 20, 2016 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

SpvBuilder.cpp SPIRV/SpvBuilder.cpp +3 -1

No files found.
--- a/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
@@ -1804,7 +1804,9 @@ Block& Builder::makeNewBlock()

 Builder::LoopBlocks& Builder::makeNewLoop()
 {
-    loops.push({makeNewBlock(), makeNewBlock(), makeNewBlock(), makeNewBlock()});
+    // Older MSVC versions don't allow inlining of blocks below.
+    LoopBlocks blocks = {makeNewBlock(), makeNewBlock(), makeNewBlock(), makeNewBlock()};
+    loops.push(blocks);
    return loops.top();
 }