From 72f4090f28b9fd25d9df51e47e779348017fdf67 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Fri, 16 Jan 2015 19:15:01 +0300 Subject: [PATCH] Fix multicharacter literals --- generator/xml_element.hpp | 15 ++++++++------- std/exception.hpp | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/generator/xml_element.hpp b/generator/xml_element.hpp index 1efb640a96..173454090b 100644 --- a/generator/xml_element.hpp +++ b/generator/xml_element.hpp @@ -4,19 +4,20 @@ #include "../std/map.hpp" #include "../std/iostream.hpp" +#include "../std/exception.hpp" struct XMLElement { enum ETag { ET_UNKNOWN = 0, - ET_OSM = 'so', - ET_NODE = 'on', - ET_WAY = 'aw', - ET_RELATION = 'er', - ET_TAG = 'at', - ET_ND = 'dn', - ET_MEMBER = 'em' + ET_OSM = 0x736F, // "os" + ET_NODE = 0x6F6E, // "no" + ET_WAY = 0x6177, // "wa" + ET_RELATION = 0x6572, // "re" + ET_TAG = 0x6174, // "ta" + ET_ND = 0x646E, // "nd" + ET_MEMBER = 0x656D // "me" }; ETag tagKey = ET_UNKNOWN; diff --git a/std/exception.hpp b/std/exception.hpp index adb9aa16b3..1fe25c8b0e 100644 --- a/std/exception.hpp +++ b/std/exception.hpp @@ -7,6 +7,8 @@ #include using std::exception; +using std::logic_error; +using std::runtime_error; #ifdef DEBUG_NEW #define new DEBUG_NEW