Merge branch 'master' into development

ETLCPP · Oct 23, 2023 · e8eeeba · e8eeeba
2 parents 8911b1e + 85f2e09
commit e8eeeba
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/include/etl/basic_string.h b/include/etl/basic_string.h
@@ -713,7 +713,7 @@ namespace etl
       set_truncated(*other != 0);
 
 #if ETL_HAS_ERROR_ON_STRING_TRUNCATION
-      ETL_ASSERT(flags.test<IS_TRUNCATED>() == false, ETL_ERROR(string_truncation))
+      ETL_ASSERT(flags.test<IS_TRUNCATED>() == false, ETL_ERROR(string_truncation));
 #endif
 #endif
 
@@ -734,7 +734,7 @@ namespace etl
       set_truncated(length_ > CAPACITY);
 
 #if ETL_HAS_ERROR_ON_STRING_TRUNCATION
-      ETL_ASSERT(flags.test<IS_TRUNCATED>() == false, ETL_ERROR(string_truncation))
+      ETL_ASSERT(flags.test<IS_TRUNCATED>() == false, ETL_ERROR(string_truncation));
 #endif
 #endif
 
@@ -774,7 +774,7 @@ namespace etl
       set_truncated(first != last);
 
 #if ETL_HAS_ERROR_ON_STRING_TRUNCATION
-      ETL_ASSERT(flags.test<IS_TRUNCATED>() == false, ETL_ERROR(string_truncation))
+      ETL_ASSERT(flags.test<IS_TRUNCATED>() == false, ETL_ERROR(string_truncation));
 #endif
 #endif
     }
@@ -793,7 +793,7 @@ namespace etl
       set_truncated(n > CAPACITY);
 
 #if ETL_HAS_ERROR_ON_STRING_TRUNCATION
-      ETL_ASSERT(flags.test<IS_TRUNCATED>() == false, ETL_ERROR(string_truncation))
+      ETL_ASSERT(flags.test<IS_TRUNCATED>() == false, ETL_ERROR(string_truncation));
 #endif
 #endif
 

diff --git a/include/etl/version.h b/include/etl/version.h
@@ -40,7 +40,7 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 20
 #define ETL_VERSION_MINOR 38
-#define ETL_VERSION_PATCH 4
+#define ETL_VERSION_PATCH 5
 
 #define ETL_VERSION       ETL_STRING(ETL_VERSION_MAJOR) "." ETL_STRING(ETL_VERSION_MINOR) "." ETL_STRING(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_WIDE_STRING(ETL_VERSION_MAJOR) L"." ETL_WIDE_STRING(ETL_VERSION_MINOR) L"." ETL_WIDE_STRING(ETL_VERSION_PATCH)

diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Embedded Template Library",
-  "version": "20.38.4",
+  "version": "20.38.5",
   "authors": {
     "name": "John Wellbelove",
     "email": "john.wellbelove@etlcpp.com"

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Embedded Template Library
-version=20.38.4
+version=20.38.5
 author= John Wellbelove <john.wellbelove@etlcpp.com>
 maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 license=MIT

diff --git a/support/Release notes.txt b/support/Release notes.txt
@@ -1,3 +1,6 @@
+===============================================================================
+#776 Add missing semicolons
+
 ===============================================================================
 20.38.4
 #773 Return raw pointer for etl::multi_span::operator->()

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-20.38.4
+20.38.5