From 730e5dde39333cb2f63c72a7d7152bee5c4dbb05 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sat, 8 Feb 2014 15:09:25 -0800
Subject: Implement AString

---
 src/strings/zstring.hpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/strings/zstring.hpp')

diff --git a/src/strings/zstring.hpp b/src/strings/zstring.hpp
index 72a227c..96aadc0 100644
--- a/src/strings/zstring.hpp
+++ b/src/strings/zstring.hpp
@@ -27,15 +27,16 @@ namespace strings
 {
     /// A non-owning string that is guaranteed to be NUL-terminated.
     /// This should be only used as a parameter.
-    class ZString : public _crtp_string<ZString, FString, ZPair>
+    class ZString : public _crtp_string<ZString, AString, ZPair>
     {
         iterator _b, _e;
         // optional
-        const FString *_base;
+        const RString *_base;
     public:
         ZString();
         // no MString
-        ZString(const FString& s);
+        ZString(const RString& s);
+        ZString(const AString& s);
         ZString(const TString& s);
         ZString(const SString&) = delete;
         //ZString(ZString);
@@ -43,16 +44,16 @@ namespace strings
         template<uint8_t n>
         ZString(const VString<n>& s);
         // dangerous
-        ZString(const char *b, const char *e, const FString *base_);
-        ZString(decltype(really_construct_from_a_pointer), const char *s, const FString *base_);
+        ZString(const char *b, const char *e, const RString *base_);
+        ZString(decltype(really_construct_from_a_pointer), const char *s, const RString *base_);
         template<size_t n>
         ZString(char (&s)[n]) = delete;
         template<size_t n>
-        ZString(const char (&s)[n], const FString *base_=nullptr);
+        ZString(const char (&s)[n], const RString *base_=nullptr);
 
         iterator begin() const;
         iterator end() const;
-        const FString *base() const;
+        const RString *base() const;
         const char *c_str() const;
     };
 
-- 
cgit v1.2.3-70-g09d2