Apply noreturn to impossible conversions.

jtv · Feb 11, 2019 · a90f312 · a90f312
1 parent 7dd0d5f
commit a90f312
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/include/pqxx/strconv.hxx b/include/pqxx/strconv.hxx
@@ -190,7 +190,8 @@ template<> struct PQXX_LIBEXPORT string_traits<std::string>
   static constexpr const char *name() noexcept { return "string"; }
   static constexpr bool has_null() noexcept { return false; }
   static bool is_null(const std::string &) { return false; }
-  static std::string null() { internal::throw_null_conversion(name()); }
+  [[noreturn]] static std::string null()
+	{ internal::throw_null_conversion(name()); }
   static void from_string(const char Str[], std::string &Obj) { Obj=Str; }
   static std::string to_string(const std::string &Obj) { return Obj; }
 };
@@ -200,7 +201,8 @@ template<> struct PQXX_LIBEXPORT string_traits<const std::string>
   static constexpr const char *name() noexcept { return "const string"; }
   static constexpr bool has_null() noexcept { return false; }
   static bool is_null(const std::string &) { return false; }
-  static const std::string null() { internal::throw_null_conversion(name()); }
+  [[noreturn]] static const std::string null()
+	{ internal::throw_null_conversion(name()); }
   static const std::string to_string(const std::string &Obj) { return Obj; }
 };
 
@@ -209,7 +211,8 @@ template<> struct PQXX_LIBEXPORT string_traits<std::stringstream>
   static constexpr const char *name() noexcept { return "stringstream"; }
   static constexpr bool has_null() noexcept { return false; }
   static bool is_null(const std::stringstream &) { return false; }
-  static std::stringstream null() { internal::throw_null_conversion(name()); }
+  [[noreturn]] static std::stringstream null()
+	{ internal::throw_null_conversion(name()); }
   static void from_string(const char Str[], std::stringstream &Obj)
 	{ Obj.clear(); Obj << Str; }
   static std::string to_string(const std::stringstream &Obj)