Skip to content

Commit 20f8f9d

Browse files
committed
fix warnings in plugins
1 parent aed676c commit 20f8f9d

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

Plugins/EvntTrigAvg/EvntTrigAvg.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ uint64 EvntTrigAvg::binDataPoint(uint64 startBin, uint64 endBin, uint64 binSize,
400400
return binDataPoint(startBin+(binsToSearch),endBin,binSize,dataPoint);
401401
}
402402
else{
403-
return NULL;
403+
return (uint64) NULL;
404404
}
405405
}
406406

@@ -442,7 +442,7 @@ float EvntTrigAvg::findMin(uint64* data_)
442442
{
443443
const ScopedLock myScopedLock(mut);
444444
//uint64 min = UINT64_MAX;
445-
uint64 min = 18446744073709551614;
445+
uint64 min = 18446744073709551614U;
446446
for (int i = 0 ; i < windowSize/binSize ; i++){
447447
if(data_[i]<min){
448448
min=data_[i];

Plugins/IntanRecordingController/rhythm-api/okFrontPanelDLL.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ class FrontPanelManager
10871087
okCFrontPanelManager_HANDLE h;
10881088
};
10891089

1090-
typedef std::auto_ptr<OpalKellyLegacy::okCFrontPanel> FrontPanelPtr;
1090+
typedef std::unique_ptr<OpalKellyLegacy::okCFrontPanel> FrontPanelPtr;
10911091

10921092
/// \brief Allows to easily open devices in any realms.
10931093
class FrontPanelDevices

Plugins/RhythmNode/rhythm-api/okFrontPanelDLL.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@ class FrontPanelManager
10871087
okCFrontPanelManager_HANDLE h;
10881088
};
10891089

1090-
typedef std::auto_ptr<OpalKellyLegacy::okCFrontPanel> FrontPanelPtr;
1090+
typedef std::unique_ptr<OpalKellyLegacy::okCFrontPanel> FrontPanelPtr;
10911091

10921092
/// \brief Allows to easily open devices in any realms.
10931093
class FrontPanelDevices

0 commit comments

Comments
 (0)