From 58805d76ccaa7e2f989998265825699e8b5564de Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Fri, 6 Dec 2019 10:25:29 +0000 Subject: [PATCH] Merge remote-tracking branch 'origin/development' into feature/add_circle-ci_support --- README.md | 1 + include/etl/cstring.h | 2 +- include/etl/u16string.h | 2 +- include/etl/u32string.h | 2 +- include/etl/wstring.h | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5f8a211b..10437ee1 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ AppVeyor ![build status](https://gitlab.com/ETLCPP/etl/badges/master/build.svg) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3c14cd918ccf40008d0bcd7b083d5946)](https://www.codacy.com/manual/jwellbelove/etl?utm_source=github.com&utm_medium=referral&utm_content=ETLCPP/etl&utm_campaign=Badge_Grade) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT) +[![Github All Releases](https://img.shields.io/github/downloads/ETLCPP/etl/total.svg)]() **Motivation** diff --git a/include/etl/cstring.h b/include/etl/cstring.h index 6812e2a8..122cdb3b 100644 --- a/include/etl/cstring.h +++ b/include/etl/cstring.h @@ -258,7 +258,7 @@ namespace etl template etl::string make_string(const char (&text) [MAX_SIZE]) { - return etl::string(text); + return etl::string(text, MAX_SIZE - 1); } } diff --git a/include/etl/u16string.h b/include/etl/u16string.h index f52417eb..3dd33aab 100644 --- a/include/etl/u16string.h +++ b/include/etl/u16string.h @@ -258,7 +258,7 @@ namespace etl template etl::u16string make_string(const char16_t (&text) [MAX_SIZE]) { - return etl::u16string(text); + return etl::u16string(text, MAX_SIZE - 1); } } diff --git a/include/etl/u32string.h b/include/etl/u32string.h index 3eec812e..7c01c7a7 100644 --- a/include/etl/u32string.h +++ b/include/etl/u32string.h @@ -258,7 +258,7 @@ namespace etl template etl::u32string make_string(const char32_t (&text) [MAX_SIZE]) { - return etl::u32string(text); + return etl::u32string(text, MAX_SIZE - 1); } } diff --git a/include/etl/wstring.h b/include/etl/wstring.h index 9b28eef2..c2533037 100644 --- a/include/etl/wstring.h +++ b/include/etl/wstring.h @@ -259,7 +259,7 @@ namespace etl template etl::wstring make_string(const wchar_t (&text) [MAX_SIZE]) { - return etl::wstring(text); + return etl::wstring(text, MAX_SIZE - 1); } }