...

1 files changed, 6 insertions, 7 deletions

diff --git a/include/cru/common/Format.hpp b/include/cru/common/Format.hpp
index d53a5720..c093c9e6 100644
--- a/include/cru/common/Format.hpp
+++ b/include/cru/common/Format.hpp
@@ -2,6 +2,7 @@
 
 #include "Exception.hpp"
 #include "String.hpp"
+#include "cru/common/Base.hpp"
 
 namespace cru {
 inline String ToString(bool value) {
@@ -32,16 +33,14 @@ std::enable_if_t<std::is_floating_point_v<T>, String> ToString(T value) {
   return String(str.cbegin(), str.cend());
 }
 
+inline String ToString(String value) { return value; }
+
 template <typename T>
-std::enable_if_t<
-    std::is_convertible_v<decltype(ToString(std::declval<const T&>)), String>,
-    String>
-ToString(const T& value, StringView option) {
-  return ToString(value);
+String ToString(T&& value, StringView option) {
+  CRU_UNUSED(option)
+  return ToString(std::forward<T>(value));
 }
 
-inline String ToString(String value) { return value; }
-
 namespace details {
 enum class FormatTokenType { PlaceHolder, Text };
 enum class FormatPlaceHolderType { None, Positioned, Named };