Fix Android build errors

glslang/MachineIndependent/iomapper.cpp:207:9: error: field 'resolver' will be initialized after field 'stage' [-Werror,-Wreorder] : resolver(r) ^ glslang/MachineIndependent/iomapper.cpp:263:9: error: field 'resolver' will be initialized after field 'stage' [-Werror,-Wreorder] : resolver(r) ^ hlsl/hlslParseHelper.cpp:70:5: error: field 'gsStreamOutput' will be initialized after field 'inputPatch' [-Werror,-Wreorder] gsStreamOutput(nullptr), ^

Fix Android build errors
15bb4370 · Daniel Koch · 8a5718a9 · 15bb4370 · 15bb4370
Commit 15bb4370 authored Apr 21, 2017 by Daniel Koch
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

iomapper.cpp glslang/MachineIndependent/iomapper.cpp +4 -4

hlslParseHelper.cpp hlsl/hlslParseHelper.cpp +2 -2

No files found.
--- a/glslang/MachineIndependent/iomapper.cpp
+++ b/glslang/MachineIndependent/iomapper.cpp
@@ -204,8 +204,8 @@ public:
 struct TResolverUniformAdaptor
 {
    TResolverUniformAdaptor(EShLanguage s, TIoMapResolver& r, TInfoSink& i, bool& e, TIntermediate& interm)
-      : resolver(r)
-      , stage(s)
+      : stage(s)
+      , resolver(r)
      , infoSink(i)
      , error(e)
      , intermediate(interm)
@@ -260,8 +260,8 @@ private:
 struct TResolverInOutAdaptor
 {
    TResolverInOutAdaptor(EShLanguage s, TIoMapResolver& r, TInfoSink& i, bool& e, TIntermediate& interm)
-      : resolver(r)
-      , stage(s)
+      : stage(s)
+      , resolver(r)
      , infoSink(i)
      , error(e)
      , intermediate(interm)

--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -61,14 +61,14 @@ HlslParseContext::HlslParseContext(TSymbolTable& symbolTable, TIntermediate& int
    loopNestingLevel(0), annotationNestingLevel(0), structNestingLevel(0), controlFlowNestingLevel(0),
    postEntryPointReturn(false),
    limits(resources.limits),
+    inputPatch(nullptr),
    builtInIoIndex(nullptr),
    builtInIoBase(nullptr),
    nextInLocation(0), nextOutLocation(0),
    sourceEntryPointName(sourceEntryPointName),
    entryPointFunction(nullptr),
    entryPointFunctionBody(nullptr),
-    gsStreamOutput(nullptr),
-    inputPatch(nullptr)
+    gsStreamOutput(nullptr)
 {
    globalUniformDefaults.clear();
    globalUniformDefaults.layoutMatrix = ElmRowMajor;