From 937ee8f77c75dd3a60585312f1c13d3bcb70c0cd Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Sun, 26 Jan 2014 01:20:34 +0000 Subject: [PATCH] Fixes clang "hidden overloaded virtual function" warning, patch by Echelon9, fixes #2388 This was SVN commit r14674. --- source/graphics/ShaderProgramFFP.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/graphics/ShaderProgramFFP.cpp b/source/graphics/ShaderProgramFFP.cpp index 49a2d48d17..79265d938b 100644 --- a/source/graphics/ShaderProgramFFP.cpp +++ b/source/graphics/ShaderProgramFFP.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2012 Wildfire Games. +/* Copyright (C) 2014 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -466,6 +466,8 @@ public: class CShaderProgramFFP_GuiAdd : public CShaderProgramFFP_Gui_Base { public: + using CShaderProgramFFP_Gui_Base::Uniform; + CShaderProgramFFP_GuiAdd() : CShaderProgramFFP_Gui_Base(STREAM_POS | STREAM_UV0) { @@ -637,6 +639,8 @@ public: class CShaderProgramFFP_GuiSolid : public CShaderProgramFFP_Gui_Base { public: + using CShaderProgramFFP_Gui_Base::Uniform; + CShaderProgramFFP_GuiSolid() : CShaderProgramFFP_Gui_Base(STREAM_POS) {