From 1965dffbbd371db069857a4b2a9d6d1454087a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 11 Sep 2015 17:47:22 +0200 Subject: [PATCH] Text: prefix private member variables with underscore. Fixes MSVC 2015 shadowing warning. --- src/Magnum/Text/Test/AbstractFontConverterTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp index 78c063868..e648d1d1b 100644 --- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp @@ -74,17 +74,17 @@ namespace { void AbstractFontConverterTest::convertGlyphs() { class GlyphExporter: public AbstractFontConverter { public: - GlyphExporter(std::u32string& characters): characters(characters) {} + GlyphExporter(std::u32string& characters): _characters{characters} {} private: Features doFeatures() const override { return Feature::ConvertData|Feature::ExportFont; } Containers::Array doExportFontToSingleData(AbstractFont&, GlyphCache&, const std::u32string& characters) const override { - this->characters = characters; + _characters = characters; return nullptr; } - std::u32string& characters; + std::u32string& _characters; }; std::u32string characters;