Merge pull request #620 from fjhenigman/foo

GLSL: Always define TShader::~Includer().
This commit is contained in:
John Kessenich 2016-12-08 11:15:59 -07:00 committed by GitHub
commit 56b4547624

View file

@ -375,9 +375,7 @@ public:
// Signals that the parser will no longer use the contents of the // Signals that the parser will no longer use the contents of the
// specified IncludeResult. // specified IncludeResult.
virtual void releaseInclude(IncludeResult* result) = 0; virtual void releaseInclude(IncludeResult* result) = 0;
#ifdef __ANDROID__ virtual ~Includer() {}
virtual ~Includer() {} // Pacify -Werror=non-virtual-dtor
#endif
}; };
// Returns an error message for any #include directive. // Returns an error message for any #include directive.