King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

GCC 4.3 fixes, thanks to Tom Browder

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@898 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2008-08-09 15:35:12 +00:00
parent 1ca2df042d
commit c6d6cada99
4 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
include/loki/SafeFormat.h
View file

@ -24,7 +24,7 @@
#include <cstdio>
#include <climits>
#include <string>
#include <string>
#include <cstring>
#include <stdexcept>
#include <utility>
#include <cassert>
@ -207,7 +207,7 @@ namespace Loki
result_ = -1;
return *this;
}
const size_t len = std::min(strlen(s), prec_);
const size_t len = std::min(std::strlen(s), prec_);
if (width_ > len) {
if (LeftJustify()) {
Write(s, s + len);
@ -397,15 +397,8 @@ namespace Loki
const Char hex1st = uppercase ? 'A' : 'a';
for (;;) {
const LOKI_SAFEFORMAT_UNSIGNED_LONG next = n / base;
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4244)
#endif
Char c = n - next * base;
#ifdef _MSC_VER
#pragma warning(pop)
#endif
c += (c <= 9) ? '0' : hex1st - 10;
Char c = static_cast<Char>(n - next * base);
c += (c <= static_cast<Char>(9)) ? '0' : static_cast<Char>(hex1st - 10);
*bufLast = c;
n = next;
if (n == 0) break;