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/strings/vstring.tcc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/strings/vstring.tcc')

diff --git a/src/strings/vstring.tcc b/src/strings/vstring.tcc
index 1aa163d..ac3dc19 100644
--- a/src/strings/vstring.tcc
+++ b/src/strings/vstring.tcc
@@ -76,11 +76,9 @@ namespace strings
         *this = XString(v);
     }
     template<uint8_t n>
-    template<size_t m>
-    VString<n>::VString(const char (&s)[m])
+    VString<n>::VString(LString l)
     {
-        static_assert(m <= n + 1, "string would truncate");
-        *this = XString(s);
+        *this = XString(l);
     }
     template<uint8_t n>
     VString<n>::VString(decltype(really_construct_from_a_pointer) e, const char *s)
@@ -143,7 +141,7 @@ namespace strings
         char buffer[len + 1];
         vsnprintf(buffer, len + 1, fmt, ap);
 
-        out = const_(buffer);
+        out = VString<len>(strings::really_construct_from_a_pointer, buffer);
         return len;
     }
 } // namespace strings
-- 
cgit v1.2.3-70-g09d2