nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

build: avoid integer length warnings

Browse Source
This commit is contained in:
Danny Robson 2017-01-05 19:49:07 +11:00
parent 449fd1d1ad
commit 98dc992473
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hash/sha2.cpp
View File

@ -207,8 +207,8 @@ void
SHA256::finish (void) SHA256::finish (void)
{ {
// Append a single 1 bit followed by 0s. // Append a single 1 bit followed by 0s.
size_t buffered = m_total % sizeof (M); auto buffered = m_total % sizeof (M);
size_t used = m_total * 8; auto used = m_total * 8u;
C[buffered++] = 0x80; C[buffered++] = 0x80;
++m_total; ++m_total;

2
json/tree.cpp
View File

@ -838,7 +838,7 @@ json::tree::number::clone (void) const
std::ostream& std::ostream&
json::tree::number::write (std::ostream &os) const json::tree::number::write (std::ostream &os) const
{ {
auto old = int (os.precision ()); auto old = os.precision ();
switch (m_repr) { switch (m_repr) {
case REAL: return os << std::numeric_limits<real_t>::digits10 << m_value.r << std::setprecision (old); case REAL: return os << std::numeric_limits<real_t>::digits10 << m_value.r << std::setprecision (old);

22
test/format.cpp
View File

@ -33,12 +33,12 @@ main (void)
CHECK_RENDER ("% .i", " ", 0); // zero precision still requires a space CHECK_RENDER ("% .i", " ", 0); // zero precision still requires a space
CHECK_RENDER ("%hhi", "1", (signed char)1); CHECK_RENDER ("%hhi", "1", (signed char)1);
CHECK_RENDER ("%hi", "1", (signed short)1); CHECK_RENDER ("%hi", "1", (signed short)1);
CHECK_RENDER ("%li", "1", (signed long)1); CHECK_RENDER ("%li", "1", (signed long)1);
CHECK_RENDER ("%lli", "1", (signed long long)1); CHECK_RENDER ("%lli", "1", (signed long long)1);
CHECK_RENDER ("%ji", "1", (intmax_t)1); CHECK_RENDER ("%ji", "1", intmax_t{1});
CHECK_RENDER ("%zi", "1", (ssize_t)1); CHECK_RENDER ("%zi", "1", ssize_t{1});
CHECK_RENDER ("%ti", "1", (ptrdiff_t)1); CHECK_RENDER ("%ti", "1", ptrdiff_t{1});
CHECK_RENDER ("%u", "1", 1u); CHECK_RENDER ("%u", "1", 1u);
CHECK_RENDER ("%03u", "001", 1u); CHECK_RENDER ("%03u", "001", 1u);
@ -49,13 +49,13 @@ main (void)
CHECK_RENDER ("%64u", " 1", 1u); CHECK_RENDER ("%64u", " 1", 1u);
CHECK_RENDER ("%hhu", "1", (unsigned char)1); CHECK_RENDER ("%hhu", "1", (unsigned char)1);
CHECK_RENDER ("%hu", "1", (unsigned short)1); CHECK_RENDER ("%hu", "1", (unsigned short)1);
CHECK_RENDER ("%lu", "1", (unsigned long)1); CHECK_RENDER ("%lu", "1", (unsigned long)1);
CHECK_RENDER ("%llu", "1", (unsigned long long)1); CHECK_RENDER ("%llu", "1", (unsigned long long)1);
CHECK_RENDER ("%ju", "1", (uintmax_t)1); CHECK_RENDER ("%ju", "1", uintmax_t{1});
CHECK_RENDER ("%zu", "0", (size_t)0); CHECK_RENDER ("%zu", "0", size_t{0});
CHECK_RENDER ("%zu", "1", (size_t)1); CHECK_RENDER ("%zu", "1", size_t{1});
CHECK_RENDER ("%!", "1", 1u); CHECK_RENDER ("%!", "1", 1u);
CHECK_RENDER ("%o", "1", 01u); CHECK_RENDER ("%o", "1", 01u);
CHECK_RENDER ("%o", "13", 013u); CHECK_RENDER ("%o", "13", 013u);

4
time_posix.cpp
View File

@ -28,8 +28,8 @@ util::sleep (uint64_t ns)
{ {
struct timespec req, rem; struct timespec req, rem;
req.tv_sec = sign_cast<time_t> (ns / SECOND); req.tv_sec = trunc_cast<time_t> (ns / SECOND);
req.tv_nsec = sign_cast<long> (ns % SECOND); req.tv_nsec = trunc_cast<long > (ns % SECOND);
while (nanosleep (&req, &rem)) { while (nanosleep (&req, &rem)) {
req = rem; req = rem;