GLSL: Always define TShader::~Includer().

Rather than update the existing ifdef to cover all necessary cases, get rid of it and always define TShader::~Includer().

GLSL: Always define TShader::~Includer().
8dcf2029 · Frank Henigman · b56f4ac7 · 8dcf2029
Commit 8dcf2029 authored Dec 06, 2016 by Frank Henigman
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

ShaderLang.h glslang/Public/ShaderLang.h +1 -3

No files found.
--- a/glslang/Public/ShaderLang.h
+++ b/glslang/Public/ShaderLang.h
@@ -375,9 +375,7 @@ public:
        // Signals that the parser will no longer use the contents of the
        // specified IncludeResult.
        virtual void releaseInclude(IncludeResult* result) = 0;
-#ifdef __ANDROID__
-        virtual ~Includer() {} // Pacify -Werror=non-virtual-dtor
-#endif
+        virtual ~Includer() {}
    };

    // Returns an error message for any #include directive.