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

add missing unsigned long overload for Windows

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@716 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2006-10-15 09:33:54 +00:00
parent 705122e74c
commit 0d71c438ab
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
include/loki/SafeFormat.h
View file

@ -33,6 +33,7 @@
// long is 32 bit on 64-bit Windows! // long is 32 bit on 64-bit Windows!
// intptr_t used to get 64 bit on Win64
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#define LOKI_SAFEFORMAT_SIGNED_LONG intptr_t #define LOKI_SAFEFORMAT_SIGNED_LONG intptr_t
@ -106,10 +107,13 @@ namespace Loki
LOKI_PRINTF_STATE_FORWARD(signed short) LOKI_PRINTF_STATE_FORWARD(signed short)
LOKI_PRINTF_STATE_FORWARD(unsigned short) LOKI_PRINTF_STATE_FORWARD(unsigned short)
LOKI_PRINTF_STATE_FORWARD(signed int) LOKI_PRINTF_STATE_FORWARD(signed int)
#if !(defined(_WIN32) || defined(_WIN64)) LOKI_PRINTF_STATE_FORWARD(signed long)
#if (defined(_WIN32) || defined(_WIN64))
LOKI_PRINTF_STATE_FORWARD(unsigned long)
#else
// on Windows already defined by uintptr_t
LOKI_PRINTF_STATE_FORWARD(unsigned int) LOKI_PRINTF_STATE_FORWARD(unsigned int)
#endif #endif
LOKI_PRINTF_STATE_FORWARD(signed long)
// Print (or gobble in case of the "*" specifier) an int // Print (or gobble in case of the "*" specifier) an int
PrintfState& operator()(LOKI_SAFEFORMAT_UNSIGNED_LONG i) { PrintfState& operator()(LOKI_SAFEFORMAT_UNSIGNED_LONG i) {
@ -586,6 +590,9 @@ namespace Loki
#endif //SAFEFORMAT_H_ #endif //SAFEFORMAT_H_
// $Log$ // $Log$
// Revision 1.29 2006/10/15 09:33:54 syntheticpp
// add missing unsigned long overload for Windows
//
// Revision 1.28 2006/07/06 18:25:28 syntheticpp // Revision 1.28 2006/07/06 18:25:28 syntheticpp
// add writing to ostream, by Tom Browder // add writing to ostream, by Tom Browder
// //

18
test/SafeFormat/main.cpp
View file

@ -239,3 +239,21 @@ int main(int argc, char** argv)
} }
} }
} }
void test_dword()
{
typedef signed int Int;
typedef unsigned int UInt;
typedef signed long Long;
typedef unsigned long ULong;
Int i(0);
UInt ui(0);
Long l(0);
ULong ul(0);
Printf("%d")(i);
Printf("%d")(ui);
Printf("%d")(l);
Printf("%d")(ul);
}