summaryrefslogtreecommitdiff
path: root/src/strings/vstring.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/strings/vstring.hpp')
-rw-r--r--src/strings/vstring.hpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/strings/vstring.hpp b/src/strings/vstring.hpp
index 9952ff9..f3437a5 100644
--- a/src/strings/vstring.hpp
+++ b/src/strings/vstring.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_STRINGS_VSTRING_HPP
-#define TMWA_STRINGS_VSTRING_HPP
+#pragma once
// strings/vstring.hpp - A small string that stores its own value.
//
// Copyright © 2013 Ben Longbons <b.r.longbons@gmail.com>
@@ -19,10 +18,15 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-# include "../sanity.hpp"
+#include "fwd.hpp"
-# include "base.hpp"
+#include <cstdio>
+#include "base.hpp"
+
+
+namespace tmwa
+{
namespace strings
{
template<uint8_t n>
@@ -40,10 +44,7 @@ namespace strings
VString(ZString z);
template<uint8_t m>
VString(VString<m> v);
- template<size_t m>
- VString(char (&s)[m]) = delete;
- template<size_t m>
- VString(const char (&s)[m]);
+ VString(LString l);
VString(decltype(really_construct_from_a_pointer) e, const char *s);
VString(char c);
VString();
@@ -74,7 +75,6 @@ T stringish(VString<sizeof(T) - 1> iv)
static_cast<VString<sizeof(T) - 1>&>(rv) = iv;
return rv;
}
+} // namespace tmwa
-# include "vstring.tcc"
-
-#endif // TMWA_STRINGS_VSTRING_HPP
+#include "vstring.tcc"