Merge remote-tracking branch 'origin/development'

ETLCPP · May 28, 2019 · 6dbcfbe · 6dbcfbe
2 parents 89df7cb + 4e10760
commit 6dbcfbe
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 25 deletions.
diff --git a/include/etl/to_string.h b/include/etl/to_string.h
@@ -46,21 +46,21 @@ namespace etl
   //***************************************************************************
   /// Default format spec.
   //***************************************************************************
-  template <typename T, const size_t SIZE>
-  const etl::istring& to_string(const T value, etl::string<SIZE>& str, const bool append = false)
+  template <typename T>
+  const etl::istring& to_string(const T value, etl::istring& str, const bool append = false)
   {
     etl::format_spec format;
 
-    return private_to_string::to_string(value, static_cast<etl::istring&>(str), format, append);
+    return private_to_string::to_string(value, str, format, append);
   }
 
   //***************************************************************************
   /// Supplied format spec..
   //***************************************************************************
-  template <typename T, const size_t SIZE>
-  const etl::istring& to_string(const T value, etl::string<SIZE>& str, const etl::format_spec& format, const bool append = false)
+  template <typename T>
+  const etl::istring& to_string(const T value, etl::istring& str, const etl::format_spec& format, const bool append = false)
   {
-    return private_to_string::to_string(value, static_cast<etl::istring&>(str), format, append);
+    return private_to_string::to_string(value, str, format, append);
   }
 }
 

diff --git a/include/etl/to_u16string.h b/include/etl/to_u16string.h
@@ -44,21 +44,21 @@ namespace etl
   //***************************************************************************
   /// Default format spec.
   //***************************************************************************
-  template <typename T, const size_t SIZE>
-  const etl::iu16string& to_string(const T value, etl::u16string<SIZE>& str, const bool append = false)
+  template <typename T>
+  const etl::iu16string& to_string(const T value, etl::iu16string& str, const bool append = false)
   {
     etl::u16format_spec format;
 
-    return private_to_string::to_string(value, static_cast<etl::iu16string&>(str), format, append);
+    return private_to_string::to_string(value, str, format, append);
   }
 
   //***************************************************************************
   /// Supplied format spec.
   //***************************************************************************
-  template <typename T, const size_t SIZE>
-  const etl::iu16string& to_string(const T value, etl::u16string<SIZE>& str, const etl::u16format_spec& format, const bool append = false)
+  template <typename T>
+  const etl::iu16string& to_string(const T value, etl::iu16string& str, const etl::u16format_spec& format, const bool append = false)
   {
-    return private_to_string::to_string(value, static_cast<etl::iu16string&>(str), format, append);
+    return private_to_string::to_string(value, str, format, append);
   }
 }
 

diff --git a/include/etl/to_u32string.h b/include/etl/to_u32string.h
@@ -44,21 +44,21 @@ namespace etl
   //***************************************************************************
   /// Default format spec.
   //***************************************************************************
-  template <typename T, const size_t SIZE>
-  const etl::iu32string& to_string(const T value, etl::u32string<SIZE>& str, const bool append = false)
+  template <typename T>
+  const etl::iu32string& to_string(const T value, etl::iu32string& str, const bool append = false)
   {
     etl::u32format_spec format;
 
-    return private_to_string::to_string(value, static_cast<etl::iu32string&>(str), format, append);
+    return private_to_string::to_string(value, str, format, append);
   }
 
   //***************************************************************************
   /// Supplied format spec.
   //***************************************************************************
-  template <typename T, const size_t SIZE>
-  const etl::iu32string& to_string(const T value, etl::u32string<SIZE>& str, const etl::u32format_spec& format, const bool append = false)
+  template <typename T>
+  const etl::iu32string& to_string(const T value, etl::iu32string& str, const etl::u32format_spec& format, const bool append = false)
   {
-    return private_to_string::to_string(value, static_cast<etl::iu32string&>(str), format, append);
+    return private_to_string::to_string(value, str, format, append);
   }
 }
 

diff --git a/include/etl/to_wstring.h b/include/etl/to_wstring.h
@@ -44,21 +44,21 @@ namespace etl
   //***************************************************************************
   /// Default format spec.
   //***************************************************************************
-  template <typename T, const size_t SIZE>
-  const etl::iwstring& to_string(const T value, etl::wstring<SIZE>& str, const bool append = false)
+  template <typename T>
+  const etl::iwstring& to_string(const T value, etl::iwstring& str, const bool append = false)
   {
     etl::wformat_spec format;
 
-    return private_to_string::to_string(value, static_cast<etl::iwstring&>(str), format, append);
+    return private_to_string::to_string(value, str, format, append);
   }
 
   //***************************************************************************
   /// Supplied format spec.
   //***************************************************************************
-  template <typename T, const size_t SIZE>
-  const etl::iwstring& to_string(const T value, etl::wstring<SIZE>& str, const etl::wformat_spec& format, const bool append = false)
+  template <typename T>
+  const etl::iwstring& to_string(const T value, etl::iwstring& str, const etl::wformat_spec& format, const bool append = false)
   {
-    return private_to_string::to_string(value, static_cast<etl::iwstring&>(str), format, append);
+    return private_to_string::to_string(value, str, format, append);
   }
 }
 

diff --git a/include/etl/version.h b/include/etl/version.h
@@ -39,7 +39,7 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 14
 #define ETL_VERSION_MINOR 26
-#define ETL_VERSION_PATCH  0
+#define ETL_VERSION_PATCH  1
 
 #define ETL_VERSION       ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_WIDE_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))

diff --git a/support/Release notes.txt b/support/Release notes.txt
@@ -1,3 +1,7 @@
+===============================================================================
+14.26.1
+Simplified 'to_string' templates.
+
 ===============================================================================
 14.26.0
 Simplified message framework internal code.