From: Mikko Rasa Date: Mon, 25 Jan 2021 02:14:35 +0000 (+0200) Subject: Add some hints for older compilers X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=15effbd5a8b135d2b38db5f4651824b9b5cd7300;p=libs%2Fgl.git Add some hints for older compilers --- diff --git a/source/material.h b/source/material.h index 3e9765d2..5515f29e 100644 --- a/source/material.h +++ b/source/material.h @@ -6,11 +6,11 @@ #include #include "color.h" #include "programdata.h" +#include "texture.h" namespace Msp { namespace GL { -class Texture; class Texturing; class Material @@ -168,7 +168,9 @@ void Material::LoaderBase::property_value_srgb_alpha(void (C::*set_value)(con template void Material::LoaderBase::property_texture(void (C::*set_texture)(const Texture *), const std::string &name) { - (static_cast(obj).*set_texture)(&get_collection().get(name)); + /* The static_cast around get_collection is needed because otherwise Android + SDK's g++ 4.9 fails to parse get as a template function call */ + (static_cast(obj).*set_texture)(&static_cast(get_collection()).get(name)); }