From a68cbf93e6f30967a6222975ea37c5e8b217b81f Mon Sep 17 00:00:00 2001 From: rivers Date: Wed, 28 Nov 2012 18:40:02 +0000 Subject: [PATCH] Minor changes to avoid compiler warnings git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15527 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- ADApp/andorSrc/andorCCD.cpp | 2 +- ADApp/andorSrc/andorCCD.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ADApp/andorSrc/andorCCD.cpp b/ADApp/andorSrc/andorCCD.cpp index aab3a38..b8433a9 100755 --- a/ADApp/andorSrc/andorCCD.cpp +++ b/ADApp/andorSrc/andorCCD.cpp @@ -1091,7 +1091,7 @@ void AndorCCD::dataTask(void) NDDataType_t dataType; at_32 firstImage, lastImage; at_32 validFirst, validLast; - int dims[2]; + size_t dims[2]; int nDims = 2; int i; epicsTimeStamp startTime; diff --git a/ADApp/andorSrc/andorCCD.h b/ADApp/andorSrc/andorCCD.h index d3d556b..235c1c2 100755 --- a/ADApp/andorSrc/andorCCD.h +++ b/ADApp/andorSrc/andorCCD.h @@ -203,7 +203,7 @@ class AndorCCD : public ADDriver { }; -#define NUM_ANDOR_DET_PARAMS (&LAST_ANDOR_PARAM - &FIRST_ANDOR_PARAM + 1) +#define NUM_ANDOR_DET_PARAMS ((int)(&LAST_ANDOR_PARAM - &FIRST_ANDOR_PARAM + 1)) static const char *driverName = "andorCCDDetector";