summaryrefslogtreecommitdiff
path: root/fixedstring.h
diff options
context:
space:
mode:
authorJohn Fultz <jfultz@wolfram.com>2019-07-21 02:06:00 -0500
committerJohn Fultz <jfultz@wolfram.com>2019-07-21 02:06:00 -0500
commitb67605814738d17484e508d037b8b1f09c27cab6 (patch)
tree9584efaa02ac17a1e0dd91b9b36797441c3cf593 /fixedstring.h
parent592be355923ea0fae3630af6fe3ba8f11523d9e4 (diff)
Visual C++ compiler warning fixes.
Mostly signed/unsigned/size_t mismatches, except for one case treating a bool as an integer.
Diffstat (limited to 'fixedstring.h')
-rw-r--r--fixedstring.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fixedstring.h b/fixedstring.h
index bedf669..cda0cf4 100644
--- a/fixedstring.h
+++ b/fixedstring.h
@@ -125,7 +125,7 @@ FixedLengthString::FixedLengthString(size_type n, char c)
inline
FixedLengthString::FixedLengthString(const char* s)
{
- unsigned int sz = strlen(s);
+ size_t sz = strlen(s);
assert(sz < maxSize);
memcpy(m_data, s, sz);
m_end = m_data + sz;
@@ -182,7 +182,7 @@ FixedLengthString::erase(const iterator i)
inline FixedLengthString::size_type
FixedLengthString::length() const
{
- return m_end - m_data;
+ return FixedLengthString::size_type(m_end - m_data);
}
inline FixedLengthString