coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-07-30 16:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve 0U ambiguity in string utility tests

Browse Source
This commit is contained in:
John Wellbelove 2020-08-02 15:14:52 +01:00
parent bd392b400c
commit bd578b6e77
10 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/config.yml
View File

@ -6,6 +6,7 @@ jobs:
branches: branches:
only: only:
- master - master
- development
steps: steps:
- checkout: - checkout:
- run: - run:

2
include/etl/string_utilities.h
View File

@ -745,7 +745,7 @@ namespace etl
if (required_size > s.size()) if (required_size > s.size())
{ {
required_size -= s.size(); required_size -= s.size();
s.insert(0U, required_size, pad_char); s.insert(size_t(0U), required_size, pad_char);
} }
} }

2
include/etl/version.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 18 #define ETL_VERSION_MAJOR 18
#define ETL_VERSION_MINOR 12 #define ETL_VERSION_MINOR 12
#define ETL_VERSION_PATCH 2 #define ETL_VERSION_PATCH 3
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) "." ETL_STRINGIFY(ETL_VERSION_MINOR) "." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_W ETL_STRINGIFY(ETL_VERSION_MAJOR) L"." ETL_STRINGIFY(ETL_VERSION_MINOR) L"." ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH) #define ETL_VERSION_U16 ETL_STRINGIFY(ETL_VERSION_MAJOR) u"." ETL_STRINGIFY(ETL_VERSION_MINOR) u"." ETL_STRINGIFY(ETL_VERSION_PATCH)

2
library.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Embedded Template Library", "name": "Embedded Template Library",
"version": "18.12.2", "version": "18.12.3",
"authors": { "authors": {
"name": "John Wellbelove", "name": "John Wellbelove",
"email": "john.wellbelove@etlcpp.com" "email": "john.wellbelove@etlcpp.com"

2
library.properties
View File

@ -1,5 +1,5 @@
name=Embedded Template Library name=Embedded Template Library
version=18.12.2 version=18.12.3
author= John Wellbelove <john.wellbelove@etlcpp.com> author= John Wellbelove <john.wellbelove@etlcpp.com>
maintainer=John Wellbelove <john.wellbelove@etlcpp.com> maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
license=MIT license=MIT

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
18.12.3
Resolve 0U constant ambiguity in string utility tests
=============================================================================== ===============================================================================
18.12.2 18.12.2
Deleted unused file. Deleted unused file.

4
test/test_string_utilities.cpp
View File

@ -1086,7 +1086,7 @@ namespace
{ {
String text(STR("Hello World")); String text(STR("Hello World"));
String expected(text); String expected(text);
expected.insert(0U, text.capacity() - expected.size(), STR('x')); expected.insert(size_t(0U), text.capacity() - expected.size(), STR('x'));
etl::pad_left(text, text.capacity() + 1U, STR('x')); etl::pad_left(text, text.capacity() + 1U, STR('x'));
@ -1154,7 +1154,7 @@ namespace
{ {
String text(STR("Hello World")); String text(STR("Hello World"));
String expected(text); String expected(text);
expected.insert(0U, text.capacity() - expected.size(), STR('x')); expected.insert(size_t(0U), text.capacity() - expected.size(), STR('x'));
etl::pad(text, text.capacity() + 1U, etl::string_pad_direction::LEFT, STR('x')); etl::pad(text, text.capacity() + 1U, etl::string_pad_direction::LEFT, STR('x'));

4
test/test_string_utilities_u16.cpp
View File

@ -1086,7 +1086,7 @@ namespace
{ {
String text(STR("Hello World")); String text(STR("Hello World"));
String expected(text); String expected(text);
expected.insert(0U, text.capacity() - expected.size(), STR('x')); expected.insert(size_t(0U), text.capacity() - expected.size(), STR('x'));
etl::pad_left(text, text.capacity() + 1U, STR('x')); etl::pad_left(text, text.capacity() + 1U, STR('x'));
@ -1154,7 +1154,7 @@ namespace
{ {
String text(STR("Hello World")); String text(STR("Hello World"));
String expected(text); String expected(text);
expected.insert(0U, text.capacity() - expected.size(), STR('x')); expected.insert(size_t(0U), text.capacity() - expected.size(), STR('x'));
etl::pad(text, text.capacity() + 1U, etl::string_pad_direction::LEFT, STR('x')); etl::pad(text, text.capacity() + 1U, etl::string_pad_direction::LEFT, STR('x'));

4
test/test_string_utilities_u32.cpp
View File

@ -1086,7 +1086,7 @@ namespace
{ {
String text(STR("Hello World")); String text(STR("Hello World"));
String expected(text); String expected(text);
expected.insert(0U, text.capacity() - expected.size(), STR('x')); expected.insert(size_t(0U), text.capacity() - expected.size(), STR('x'));
etl::pad_left(text, text.capacity() + 1U, STR('x')); etl::pad_left(text, text.capacity() + 1U, STR('x'));
@ -1154,7 +1154,7 @@ namespace
{ {
String text(STR("Hello World")); String text(STR("Hello World"));
String expected(text); String expected(text);
expected.insert(0U, text.capacity() - expected.size(), STR('x')); expected.insert(size_t(0U), text.capacity() - expected.size(), STR('x'));
etl::pad(text, text.capacity() + 1U, etl::string_pad_direction::LEFT, STR('x')); etl::pad(text, text.capacity() + 1U, etl::string_pad_direction::LEFT, STR('x'));

4
test/test_string_utilities_wchar_t.cpp
View File

@ -1086,7 +1086,7 @@ namespace
{ {
String text(STR("Hello World")); String text(STR("Hello World"));
String expected(text); String expected(text);
expected.insert(0U, text.capacity() - expected.size(), STR('x')); expected.insert(size_t(0U), text.capacity() - expected.size(), STR('x'));
etl::pad_left(text, text.capacity() + 1U, STR('x')); etl::pad_left(text, text.capacity() + 1U, STR('x'));
@ -1154,7 +1154,7 @@ namespace
{ {
String text(STR("Hello World")); String text(STR("Hello World"));
String expected(text); String expected(text);
expected.insert(0U, text.capacity() - expected.size(), STR('x')); expected.insert(size_t(0U), text.capacity() - expected.size(), STR('x'));
etl::pad(text, text.capacity() + 1U, etl::string_pad_direction::LEFT, STR('x')); etl::pad(text, text.capacity() + 1U, etl::string_pad_direction::LEFT, STR('x'));