ScalarTypeID mapping fixed in case 'int' == 'long', e.g. RTEMS-i386

This commit is contained in:
Matej Sekoranja
2014-11-05 13:52:10 +01:00
parent 80e1dfd142
commit 554dc06eda
4 changed files with 53 additions and 50 deletions

View File

@@ -289,6 +289,9 @@ static void testError()
static void testMapping()
{
#define OP(TYPE, ENUM) \
printf(#TYPE ": sizeof %u typeid '%s' ScalarTypeID %d\n",\
(unsigned)sizeof(TYPE), typeid(TYPE).name(),\
epics::pvData::ScalarTypeID<TYPE>::value);\
testOk1(typeid(ScalarTypeTraits<ENUM>::type)==typeid(TYPE)); \
testOk1(ENUM==(ScalarType)ScalarTypeID<TYPE>::value); \
testOk1(ENUM==(ScalarType)ScalarTypeID<const TYPE>::value);
@@ -306,12 +309,11 @@ static void testMapping()
OP(string, pvString)
#undef OP
testOk1((ScalarType)ScalarTypeID<PVField>::value==(ScalarType)-1);
}
MAIN(testIntrospect)
{
testPlan(327);
testPlan(326);
fieldCreate = getFieldCreate();
pvDataCreate = getPVDataCreate();
standardField = getStandardField();