From 56e149a51562b9d2620bc9037a81735c29ea95af Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Mon, 14 Apr 2014 11:02:47 -0700 Subject: Ditch gcc 4.6 support --- src/strings/zstring.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/strings/zstring.hpp') diff --git a/src/strings/zstring.hpp b/src/strings/zstring.hpp index 717da88..c75c7c9 100644 --- a/src/strings/zstring.hpp +++ b/src/strings/zstring.hpp @@ -24,6 +24,7 @@ # include # include "base.hpp" +# include "literal.hpp" namespace strings { @@ -45,13 +46,10 @@ namespace strings ZString(const XString&) = delete; template ZString(const VString& s); + ZString(const LString& s); // dangerous ZString(const char *b, const char *e, const RString *base_); ZString(decltype(really_construct_from_a_pointer), const char *s, const RString *base_); - template - ZString(char (&s)[n]) = delete; - template - ZString(const char (&s)[n], const RString *base_=nullptr); iterator begin() const; iterator end() const; -- cgit v1.2.3-60-g2f50