From 56e149a51562b9d2620bc9037a81735c29ea95af Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Mon, 14 Apr 2014 11:02:47 -0700
Subject: Ditch gcc 4.6 support

---
 src/map/mapflag.cpp | 64 ++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

(limited to 'src/map/mapflag.cpp')

diff --git a/src/map/mapflag.cpp b/src/map/mapflag.cpp
index 51af30a..65126d9 100644
--- a/src/map/mapflag.cpp
+++ b/src/map/mapflag.cpp
@@ -40,41 +40,41 @@ bool extract<MapFlag, void, void>(XString str, MapFlag *mf)
 {
     const struct
     {
-        ZString str;
+        LString str;
         MapFlag id;
     } flags[] =
     {
-        //{ZString("alias"), MapFlag::ALIAS},
-        //{ZString("nomemo"), MapFlag::NOMEMO},
-        {ZString("noteleport"), MapFlag::NOTELEPORT},
-        {ZString("noreturn"), MapFlag::NORETURN},
-        {ZString("monster_noteleport"), MapFlag::MONSTER_NOTELEPORT},
-        {ZString("nosave"), MapFlag::NOSAVE},
-        //{ZString("nobranch"), MapFlag::NOBRANCH},
-        {ZString("nopenalty"), MapFlag::NOPENALTY},
-        {ZString("pvp"), MapFlag::PVP},
-        {ZString("pvp_noparty"), MapFlag::PVP_NOPARTY},
-        //{ZString("pvp_noguild"), MapFlag::PVP_NOGUILD},
-        //{ZString("pvp_nightmaredrop"), MapFlag::PVP_NIGHTMAREDROP},
-        {ZString("pvp_nocalcrank"), MapFlag::PVP_NOCALCRANK},
-        //{ZString("gvg"), MapFlag::GVG},
-        //{ZString("gvg_noparty"), MapFlag::GVG_NOPARTY},
-        //{ZString("nozenypenalty"), MapFlag::NOZENYPENALTY},
-        //{ZString("notrade"), MapFlag::NOTRADE},
-        //{ZString("noskill"), MapFlag::NOSKILL},
-        {ZString("nowarp"), MapFlag::NOWARP},
-        {ZString("nowarpto"), MapFlag::NOWARPTO},
-        {ZString("nopvp"), MapFlag::NOPVP},
-        //{ZString("noicewall"), MapFlag::NOICEWALL},
-        {ZString("snow"), MapFlag::SNOW},
-        {ZString("fog"), MapFlag::FOG},
-        {ZString("sakura"), MapFlag::SAKURA},
-        {ZString("leaves"), MapFlag::LEAVES},
-        {ZString("rain"), MapFlag::RAIN},
-        {ZString("no_player_drops"), MapFlag::NO_PLAYER_DROPS},
-        {ZString("town"), MapFlag::TOWN},
-        {ZString("outside"), MapFlag::OUTSIDE},
-        {ZString("resave"), MapFlag::RESAVE},
+        //{"alias"_s, MapFlag::ALIAS},
+        //{"nomemo"_s, MapFlag::NOMEMO},
+        {"noteleport"_s, MapFlag::NOTELEPORT},
+        {"noreturn"_s, MapFlag::NORETURN},
+        {"monster_noteleport"_s, MapFlag::MONSTER_NOTELEPORT},
+        {"nosave"_s, MapFlag::NOSAVE},
+        //{"nobranch"_s, MapFlag::NOBRANCH},
+        {"nopenalty"_s, MapFlag::NOPENALTY},
+        {"pvp"_s, MapFlag::PVP},
+        {"pvp_noparty"_s, MapFlag::PVP_NOPARTY},
+        //{"pvp_noguild"_s, MapFlag::PVP_NOGUILD},
+        //{"pvp_nightmaredrop"_s, MapFlag::PVP_NIGHTMAREDROP},
+        {"pvp_nocalcrank"_s, MapFlag::PVP_NOCALCRANK},
+        //{"gvg"_s, MapFlag::GVG},
+        //{"gvg_noparty"_s, MapFlag::GVG_NOPARTY},
+        //{"nozenypenalty"_s, MapFlag::NOZENYPENALTY},
+        //{"notrade"_s, MapFlag::NOTRADE},
+        //{"noskill"_s, MapFlag::NOSKILL},
+        {"nowarp"_s, MapFlag::NOWARP},
+        {"nowarpto"_s, MapFlag::NOWARPTO},
+        {"nopvp"_s, MapFlag::NOPVP},
+        //{"noicewall"_s, MapFlag::NOICEWALL},
+        {"snow"_s, MapFlag::SNOW},
+        {"fog"_s, MapFlag::FOG},
+        {"sakura"_s, MapFlag::SAKURA},
+        {"leaves"_s, MapFlag::LEAVES},
+        {"rain"_s, MapFlag::RAIN},
+        {"no_player_drops"_s, MapFlag::NO_PLAYER_DROPS},
+        {"town"_s, MapFlag::TOWN},
+        {"outside"_s, MapFlag::OUTSIDE},
+        {"resave"_s, MapFlag::RESAVE},
     };
     for (auto& pair : flags)
         if (str == pair.str)
-- 
cgit v1.2.3-70-g09d2