From 5a7ff4d20afb90b0f5c2a0daac5a4ab1ada25390 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Wed, 2 Jul 2014 15:38:05 +1000 Subject: [PATCH] build: silence sign promotion warnings --- backtrace_execinfo.cpp | 12 +++++++----- hash/bsdsum.cpp | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/backtrace_execinfo.cpp b/backtrace_execinfo.cpp index 4a15340e..237f38f8 100644 --- a/backtrace_execinfo.cpp +++ b/backtrace_execinfo.cpp @@ -14,12 +14,14 @@ using namespace std; debug::backtrace::backtrace (void): m_frames (DEFAULT_DEPTH) { - int final; - while ((final = ::backtrace (&m_frames[0], m_frames.size ())) == sign_cast (m_frames.size ())) - m_frames.resize (m_frames.size () * 2); + size_t last; + size_t size = m_frames.size (); - CHECK_HARD (final > 0); - m_frames.resize ((unsigned)final); + while ((last = ::backtrace (&m_frames[0], m_frames.size ())) == size) + m_frames.resize (size = m_frames.size () * 2); + + CHECK_HARD (last > 0); + m_frames.resize (last); } diff --git a/hash/bsdsum.cpp b/hash/bsdsum.cpp index 1840f5d9..43b14093 100644 --- a/hash/bsdsum.cpp +++ b/hash/bsdsum.cpp @@ -26,7 +26,7 @@ bsdsum (const void *restrict _data, size_t size) { uint16_t accum = 0; for (size_t i = 0; i < size; ++i) { - accum = (accum >> 1) | ((accum & 0x1) << 15); + accum = (accum >> 1u) | ((accum & 0x01u) << 15u); accum += data[i]; }