Merge pull request #620 from fjhenigman/foo

GLSL: Always define TShader::~Includer().
2016-12-08 11:15:59 -07:00 · 2016-12-08 11:15:59 -07:00 · 56b4547624
commit 56b4547624
parent b56f4ac72c 8dcf20298f
1 changed files with 1 additions and 3 deletions
--- 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.