diff options
Diffstat (limited to 'Build/source/texk/dvisvgm/dvisvgm-src/src/Message.cpp')
-rw-r--r-- | Build/source/texk/dvisvgm/dvisvgm-src/src/Message.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/src/Message.cpp b/Build/source/texk/dvisvgm/dvisvgm-src/src/Message.cpp index 40b0909f173..7e60ad3b9fa 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-src/src/Message.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-src/src/Message.cpp @@ -2,7 +2,7 @@ ** Message.cpp ** ** ** ** This file is part of dvisvgm -- a fast DVI to SVG converter ** -** Copyright (C) 2005-2016 Martin Gieseking <martin.gieseking@uos.de> ** +** Copyright (C) 2005-2017 Martin Gieseking <martin.gieseking@uos.de> ** ** ** ** This program is free software; you can redistribute it and/or ** ** modify it under the terms of the GNU General Public License as ** @@ -24,8 +24,8 @@ #include <cstring> #include <iostream> #include <map> -#include "Message.h" -#include "Terminal.h" +#include "Message.hpp" +#include "Terminal.hpp" using namespace std; @@ -234,15 +234,16 @@ void Message::init () { _classColors[MC_PROGRESS] = Color(Terminal::MAGENTA); if (const char *color_str = getenv("DVISVGM_COLORS")) { - map<string, MessageClass> classes; - classes["er"] = MC_ERROR; - classes["wn"] = MC_WARNING; - classes["pn"] = MC_PAGE_NUMBER; - classes["ps"] = MC_PAGE_SIZE; - classes["fw"] = MC_PAGE_WRITTEN; - classes["sm"] = MC_STATE; - classes["tr"] = MC_TRACING; - classes["pi"] = MC_PROGRESS; + map<string, MessageClass> classes = { + {"er", MC_ERROR}, + {"wn", MC_WARNING}, + {"pn", MC_PAGE_NUMBER}, + {"ps", MC_PAGE_SIZE}, + {"fw", MC_PAGE_WRITTEN}, + {"sm", MC_STATE}, + {"tr", MC_TRACING}, + {"pi", MC_PROGRESS}, + }; const char *p=color_str; // skip leading whitespace @@ -251,7 +252,7 @@ void Message::init () { // iterate over color assignments while (strlen(p) >= 5) { - map<string, MessageClass>::iterator it = classes.find(string(p, 2)); + auto it = classes.find(string(p, 2)); if (it != classes.end() && p[2] == '=') { int bgcolor, fgcolor; if (colorchar2int(p[3], &bgcolor) && colorchar2int(p[4], &fgcolor)) { |