forked from epics_driver_modules/motorBase
Cast pointers to init functions as DEVSUPFUN to eliminate compile errors
like this:
../devOmsPC68.cc:74:1: error: invalid conversion from ‘long int
(*)(int)’ to ‘DEVSUPFUN {aka long int (*)(void*)}’ [-fpermissive]
};
and this:
./devPmac.cc:66: error: invalid conversion from 'long int (*)(int)' to
'long int (*)(void*)'
This commit is contained in:
@@ -58,7 +58,7 @@ static RTN_STATUS Pmac_end_trans(struct motorRecord *);
|
||||
|
||||
struct motor_dset devPmac =
|
||||
{
|
||||
{8, NULL, Pmac_init, Pmac_init_record, NULL},
|
||||
{8, NULL, (DEVSUPFUN) Pmac_init, Pmac_init_record, NULL},
|
||||
motor_update_values,
|
||||
Pmac_start_trans,
|
||||
Pmac_build_trans,
|
||||
|
||||
@@ -52,7 +52,7 @@ static RTN_STATUS MAXv_end_trans(struct motorRecord *);
|
||||
|
||||
struct motor_dset devMAXv =
|
||||
{
|
||||
{8, NULL, MAXv_init, MAXv_init_record, NULL},
|
||||
{8, NULL, (DEVSUPFUN) MAXv_init, MAXv_init_record, NULL},
|
||||
motor_update_values,
|
||||
MAXv_start_trans,
|
||||
oms_build_trans,
|
||||
|
||||
@@ -71,7 +71,7 @@ static RTN_STATUS oms_end_trans(struct motorRecord *);
|
||||
|
||||
struct motor_dset devOMS =
|
||||
{
|
||||
{8, NULL, oms_init, oms_init_record, NULL},
|
||||
{8, NULL, (DEVSUPFUN) oms_init, oms_init_record, NULL},
|
||||
motor_update_values,
|
||||
oms_start_trans,
|
||||
oms_build_trans,
|
||||
|
||||
@@ -69,7 +69,7 @@ static RTN_STATUS oms_end_trans(struct motorRecord *);
|
||||
|
||||
struct motor_dset devOms58 =
|
||||
{
|
||||
{8, NULL, oms_init, oms_init_record, NULL},
|
||||
{8, NULL, (DEVSUPFUN) oms_init, oms_init_record, NULL},
|
||||
motor_update_values,
|
||||
oms_start_trans,
|
||||
oms_build_trans,
|
||||
|
||||
@@ -66,7 +66,7 @@ STATIC RTN_STATUS oms_end_trans(struct motorRecord *);
|
||||
|
||||
struct motor_dset devOmsPC68 =
|
||||
{
|
||||
{8, NULL, oms_init, oms_init_record, NULL},
|
||||
{8, NULL, (DEVSUPFUN) oms_init, oms_init_record, NULL},
|
||||
motor_update_values,
|
||||
oms_start_trans,
|
||||
oms_build_trans,
|
||||
|
||||
Reference in New Issue
Block a user