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

remove warnings, prepare windows 64 bit port

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@436 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2006-01-05 21:29:30 +00:00
parent 21341bc317
commit 9b27ec858e
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
include/loki/SafeFormat.h
View file

@ -208,7 +208,7 @@ namespace Loki
return *this; return *this;
} }
void FormatWithCurrentFlags(const unsigned long i) { void FormatWithCurrentFlags(const uintptr_t i) {
// look at the format character // look at the format character
Char formatChar = *format_; Char formatChar = *format_;
bool isSigned = formatChar == 'd' || formatChar == 'i'; bool isSigned = formatChar == 'd' || formatChar == 'i';
@ -339,13 +339,20 @@ namespace Loki
Write(&c, &c + 1); Write(&c, &c + 1);
} }
} }
Char* RenderWithoutSign(unsigned long n, char* bufLast, Char* RenderWithoutSign(uintptr_t n, char* bufLast,
unsigned int base, bool uppercase) { unsigned int base, bool uppercase) {
const Char hex1st = uppercase ? 'A' : 'a'; const Char hex1st = uppercase ? 'A' : 'a';
for (;;) { for (;;) {
const unsigned long next = n / base; const uintptr_t next = n / base;
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable: 4244)
#endif
Char c = n - next * base; Char c = n - next * base;
#ifdef _MSC_VER
#pragma warning(pop)
#endif
c += (c <= 9) ? '0' : hex1st - 10; c += (c <= 9) ? '0' : hex1st - 10;
*bufLast = c; *bufLast = c;
n = next; n = next;
@ -354,17 +361,17 @@ namespace Loki
} }
return bufLast; return bufLast;
} }
char* RenderWithoutSign(long n, char* bufLast, unsigned int base, char* RenderWithoutSign(long n, char* bufLast, unsigned int base,
bool uppercase) { bool uppercase) {
if (n != LONG_MIN) { if (n != LONG_MIN) {
return RenderWithoutSign(static_cast<unsigned long>(n < 0 ? -n : n), return RenderWithoutSign(static_cast<uintptr_t>(n < 0 ? -n : n),
bufLast, base, uppercase); bufLast, base, uppercase);
} }
// annoying corner case // annoying corner case
char* save = bufLast; char* save = bufLast;
++n; ++n;
bufLast = RenderWithoutSign(static_cast<unsigned long>(n), bufLast = RenderWithoutSign(static_cast<uintptr_t>(n),
bufLast, base, uppercase); bufLast, base, uppercase);
--(*save); --(*save);
return bufLast; return bufLast;
@ -487,7 +494,7 @@ namespace Loki
size_t width_; size_t width_;
size_t prec_; size_t prec_;
unsigned int flags_; unsigned int flags_;
int result_; ptrdiff_t result_;
}; };
PrintfState<std::FILE*, char> Printf(const char* format) { PrintfState<std::FILE*, char> Printf(const char* format) {