X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterial.h;h=5515f29eee539a211059fb15f6869332659c1224;hp=3e9765d2a2b9cbfa7d408a37642ca12577fa9ed1;hb=15effbd5a8b135d2b38db5f4651824b9b5cd7300;hpb=3c38aed495719bd895c1ca8df68280747fcb9a6f

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 <msp/datafile/objectloader.h>
 #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<C>::property_value_srgb_alpha(void (C::*set_value)(con
 template<typename C>
 void Material::LoaderBase<C>::property_texture(void (C::*set_texture)(const Texture *), const std::string &name)
 {
-	(static_cast<C &>(obj).*set_texture)(&get_collection().get<GL::Texture>(name));
+	/* The static_cast around get_collection is needed because otherwise Android
+	SDK's g++ 4.9 fails to parse get<Texture> as a template function call */
+	(static_cast<C &>(obj).*set_texture)(&static_cast<Collection &>(get_collection()).get<Texture>(name));
 }