diff options
| author | Stefan Boberg <[email protected]> | 2021-09-03 10:06:11 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-03 10:06:11 +0200 |
| commit | c62237e96977f11a02a1ef868d2cfe12ff42f943 (patch) | |
| tree | d23c022e50d2980a508a36f969e19b8404b2fde6 | |
| parent | Fix clang path for ZEN_ARRAY_COUNT (diff) | |
| download | zen-c62237e96977f11a02a1ef868d2cfe12ff42f943.tar.xz zen-c62237e96977f11a02a1ef868d2cfe12ff42f943.zip | |
fix for extern template class declarations, also made integer constant in test explicitly unsigned
| -rw-r--r-- | zencore/include/zencore/string.h | 4 | ||||
| -rw-r--r-- | zencore/string.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/zencore/include/zencore/string.h b/zencore/include/zencore/string.h index 291b18043..de2ca71d9 100644 --- a/zencore/include/zencore/string.h +++ b/zencore/include/zencore/string.h @@ -320,7 +320,7 @@ protected: ////////////////////////////////////////////////////////////////////////// -extern template StringBuilderImpl<char>; +extern template class StringBuilderImpl<char>; class StringBuilderBase : public StringBuilderImpl<char> { @@ -390,7 +390,7 @@ private: ////////////////////////////////////////////////////////////////////////// -extern template StringBuilderImpl<wchar_t>; +extern template class StringBuilderImpl<wchar_t>; class WideStringBuilderBase : public StringBuilderImpl<wchar_t> { diff --git a/zencore/string.cpp b/zencore/string.cpp index b6093ac2e..21ba5b204 100644 --- a/zencore/string.cpp +++ b/zencore/string.cpp @@ -534,7 +534,7 @@ TEST_CASE("niceNum") NiceNumGeneral(1000000000000000000, Buffer, kNicenum1024); CHECK(StringEquals(Buffer, "888P")); - NiceNumGeneral(10000000000000000000, Buffer, kNicenum1024); + NiceNumGeneral(10000000000000000000ull, Buffer, kNicenum1024); CHECK(StringEquals(Buffer, "8.67E")); // pow2 |