epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fixed warnings on 64-bit platforms.

Browse Source
This commit is contained in:
Andrew Johnson
2008-01-04 21:32:19 +00:00
parent b0c0ab77ac
commit 91cdaf7cca
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libCom/test/epicsExceptionTest.cpp
View File

@@ -40,11 +40,15 @@ const nothrow_t nothrow ;
# else
static const size_t unsuccessfulNewSize = numeric_limits < size_t > :: max () - 100;
# endif
// passing a size_t to printf() needs "%zu" on some platforms
# define Z_MODIFIER ""
#elif defined(vxWorks)
// Neither vxWorks 5 or 6 supply true ANSI C++
static const size_t unsuccessfulNewSize = UINT_MAX - 15u;
# define Z_MODIFIER ""
#else
static const size_t unsuccessfulNewSize = numeric_limits < size_t > :: max ();
# define Z_MODIFIER "z"
#endif
class exThread : public epicsThreadRunable {
@@ -61,10 +65,10 @@ static void epicsExceptionTestPrivate ()
{
try {
char * p = new char [unsuccessfulNewSize];
testFail("new char[%u] returned %p", unsuccessfulNewSize, p);
testFail("new char[%" Z_MODIFIER "u] returned %p", unsuccessfulNewSize, p);
}
catch ( const bad_alloc & ) {
testPass("new char[%u] threw", unsuccessfulNewSize);
testPass("new char[%" Z_MODIFIER "u] threw", unsuccessfulNewSize);
}
catch ( ... ) {
testFail("new: threw wrong type");