Browse Source

Text: prefix private member variables with underscore.

Fixes MSVC 2015 shadowing warning.
pull/110/head
Vladimír Vondruš 11 years ago
parent
commit
1965dffbbd
  1. 6
      src/Magnum/Text/Test/AbstractFontConverterTest.cpp

6
src/Magnum/Text/Test/AbstractFontConverterTest.cpp

@ -74,17 +74,17 @@ namespace {
void AbstractFontConverterTest::convertGlyphs() { void AbstractFontConverterTest::convertGlyphs() {
class GlyphExporter: public AbstractFontConverter { class GlyphExporter: public AbstractFontConverter {
public: public:
GlyphExporter(std::u32string& characters): characters(characters) {} GlyphExporter(std::u32string& characters): _characters{characters} {}
private: private:
Features doFeatures() const override { return Feature::ConvertData|Feature::ExportFont; } Features doFeatures() const override { return Feature::ConvertData|Feature::ExportFont; }
Containers::Array<char> doExportFontToSingleData(AbstractFont&, GlyphCache&, const std::u32string& characters) const override { Containers::Array<char> doExportFontToSingleData(AbstractFont&, GlyphCache&, const std::u32string& characters) const override {
this->characters = characters; _characters = characters;
return nullptr; return nullptr;
} }
std::u32string& characters; std::u32string& _characters;
}; };
std::u32string characters; std::u32string characters;

Loading…
Cancel
Save