From 43b3a224d36a8c51558fd208e74814d2fd9d30ac Mon Sep 17 00:00:00 2001
From: Neargye <neargye@gmail.com>
Date: Fri, 31 Aug 2018 23:02:22 +0500
Subject: [PATCH] clean-up

---
 include/nameof.hpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/nameof.hpp b/include/nameof.hpp
index 5bdee83..ba4565b 100644
--- a/include/nameof.hpp
+++ b/include/nameof.hpp
@@ -118,6 +118,8 @@ class cstring final {
 
   constexpr cstring(const char* str) noexcept : cstring{str, detail::StrLen(str), 0, 0} {}
 
+  constexpr cstring() noexcept : cstring{nullptr, 0, 0, 0} {}
+
   cstring(const std::string& str) noexcept : cstring{str.data(), str.size(), 0, 0} {}
 
   constexpr cstring(const cstring&) = default;
@@ -146,7 +148,7 @@ class cstring final {
 
   constexpr const char& at(std::size_t i) const {
     return (i < size_) ? str_[i]
-                       : (throw std::out_of_range("cstring::at"), str_[0]);
+                       : (throw std::out_of_range{"cstring::at"}, str_[0]);
   }
 
   constexpr const char& front() const { return str_[0]; }
@@ -189,11 +191,11 @@ class cstring final {
   }
 
   std::string append(cstring s) const {
-    return std::string(str_, size_).append(s.str_, s.size_);
+    return std::string{str_, size_}.append(s.str_, s.size_);
   }
 
   friend std::string operator+(cstring lhs, cstring rhs) {
-    return std::string(lhs) + std::string(rhs);
+    return std::string{lhs} +std::string{rhs};
   }
 
   friend std::ostream& operator<<(std::ostream& os, cstring str) {
@@ -201,7 +203,7 @@ class cstring final {
     return os;
   }
 
-  operator std::string() const { return std::string(str_, size_); }
+  operator std::string() const { return std::string{str_, size_}; }
 };
 
 namespace detail {