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/grfio.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/src/map/grfio.cpp b/src/map/grfio.cpp
index c3d1e40..b03456c 100644
--- a/src/map/grfio.cpp
+++ b/src/map/grfio.cpp
@@ -50,7 +50,7 @@ bool load_resnametable(ZString filename)
     io::ReadFile in(filename);
     if (!in.is_open())
     {
-        FPRINTF(stderr, "Missing %s\n", filename);
+        FPRINTF(stderr, "Missing %s\n"_fmt, filename);
         return false;
     }
 
@@ -63,7 +63,7 @@ bool load_resnametable(ZString filename)
         if (!extract(line,
                     record<'#'>(&key, &value)))
         {
-            PRINTF("Bad resnametable line: %s\n", line);
+            PRINTF("Bad resnametable line: %s\n"_fmt, line);
             rv = false;
             continue;
         }
@@ -85,7 +85,7 @@ std::vector<uint8_t> grfio_reads(MapName rname)
 {
     MString lfname_;
     // TODO ... instead of here
-    lfname_ += "data/";
+    lfname_ += "data/"_s;
     lfname_ += grfio_resnametable(rname);
     AString lfname = AString(lfname_);
 
@@ -93,7 +93,7 @@ std::vector<uint8_t> grfio_reads(MapName rname)
     int fd = open(lfname.c_str(), O_RDONLY);
     if (fd == -1)
     {
-        FPRINTF(stderr, "Resource %s (file %s) not found\n",
+        FPRINTF(stderr, "Resource %s (file %s) not found\n"_fmt,
                 rname, lfname);
         return {};
     }
-- 
cgit v1.2.3-60-g2f50