Fix 32 bit build

rick-de-water · Jan 8, 2020 · 45b9f5f · 45b9f5f
1 parent 0696593
commit 45b9f5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Lingo is an encoding aware string library for C++11 and up. It tries to be a dro
 * Encoding and code page aware `lingo::string` and `lingo::string_view`, almost fully compatible with `std::string` and `std::string_view`.
 * Null terminator aware `lingo::string_view`.
 * Support for endianness conversion.
-* Automatic conversion between `lingo::string`s of different encodings and code pages.
+* Explicit conversion constructors between `lingo::string`s of different encodings and code pages.
 * `lingo::encoding::*` for low level encoding and decoding of code points.
 * `lingo::page::*` for additional code point information and conversion between different code pages.
 * `lingo::error::*` for different error handling behaviours.

diff --git a/src/lib/lingo/string_storage.hpp b/src/lib/lingo/string_storage.hpp
@@ -72,7 +72,7 @@ namespace lingo
 		static_assert(sizeof(basic_string_storage_data<uint_least8_t>) == sizeof(void*) * 4, "string storage is the correct size");
 		static_assert(sizeof(basic_string_storage_data<uint_least16_t>) == sizeof(void*) * 4, "string storage is the correct size");
 		static_assert(sizeof(basic_string_storage_data<uint_least32_t>) == sizeof(void*) * 4, "string storage is the correct size");
-		static_assert(sizeof(basic_string_storage_data<uint_least64_t>) == sizeof(void*) * 4, "string storage is the correct size");
+		static_assert(sizeof(basic_string_storage_data<uint_least64_t>) == sizeof(void*) * 4 || sizeof(uint_least64_t) > sizeof(void*), "string storage is the correct size");
 	}
 
 	template <typename Unit, typename Allocator = std::allocator<Unit>>
@@ -406,7 +406,7 @@ namespace lingo
 	static_assert(sizeof(basic_string_storage<uint_least8_t>) == sizeof(void*) * 4, "string storage is the correct size");
 	static_assert(sizeof(basic_string_storage<uint_least16_t>) == sizeof(void*) * 4, "string storage is the correct size");
 	static_assert(sizeof(basic_string_storage<uint_least32_t>) == sizeof(void*) * 4, "string storage is the correct size");
-	static_assert(sizeof(basic_string_storage<uint_least64_t>) == sizeof(void*) * 4, "string storage is the correct size");
+	static_assert(sizeof(basic_string_storage<uint_least64_t>) == sizeof(void*) * 4 || sizeof(uint_least64_t) > sizeof(void*), "string storage is the correct size");
 }
 
 #endif