Commit f7064e6e authored by Jussi Lindgren's avatar Jussi Lindgren

Everything: Fix compiler issues on Fedora

parent 1a9da88e
......@@ -19,7 +19,6 @@ CDriverGenericSawTooth::CDriverGenericSawTooth(IDriverContext& rDriverContext)
:IDriver(rDriverContext)
,m_pCallback(NULL)
,m_ui32ExternalBlockSize(0)
,m_vSample(NULL)
,m_ui64TotalSampleCount(0)
,m_ui64StartTime(0)
{
......
......@@ -17,6 +17,7 @@
#include <functional>
#include <cctype>
#include <cstring>
#include <cmath> // std::isnan, std::isfinite
#include <cassert>
......@@ -953,11 +954,7 @@ void CAcquisitionServer::setSamples(const float32* pSample, const uint32 ui32Sam
{
const uint32 l_ui32Channel = m_vSelectedChannels[j];
#ifdef TARGET_OS_Windows
if(_isnan(pSample[l_ui32Channel*ui32SampleCount+i]) || !_finite(pSample[l_ui32Channel*ui32SampleCount+i])) // NaN or infinite values
#else
if(std::isnan(pSample[l_ui32Channel*ui32SampleCount+i]) || !finite(pSample[l_ui32Channel*ui32SampleCount+i])) // NaN or infinite values
#endif
if(std::isnan(pSample[l_ui32Channel*ui32SampleCount+i]) || !std::isfinite(pSample[l_ui32Channel*ui32SampleCount+i])) // NaN or infinite values
{
l_bHadNaN = true;
......
......@@ -37,7 +37,7 @@ CBoxAlgorithmBrainampFileWriter::CBoxAlgorithmBrainampFileWriter(void)
boolean CBoxAlgorithmBrainampFileWriter::initialize(void)
{
const IBox& l_rStaticBoxContext=this->getStaticBoxContext();
// const IBox& l_rStaticBoxContext=this->getStaticBoxContext();
m_bIsVmrkHeaderFileWritten = false;
......@@ -106,7 +106,6 @@ boolean CBoxAlgorithmBrainampFileWriter::initialize(void)
boolean CBoxAlgorithmBrainampFileWriter::uninitialize(void)
{
if(m_pStreamDecoder)
{
m_pStreamDecoder->uninitialize();
......
......@@ -274,11 +274,7 @@ namespace OpenViBEPlugins
l_oStringStream.str(l_oLine);
l_oStringStream>>l_f64Sample;
#ifdef TARGET_OS_Windows
if(_isnan(l_f64Sample))
#else
if(std::isnan(l_f64Sample))
#endif
if(std::isnan(l_f64Sample))
{
l_pBuffer[count] = (count != 0) ? l_pBuffer[count-1] : 0.0;
}
......@@ -288,11 +284,7 @@ namespace OpenViBEPlugins
}
l_oStringStream>>l_f64Sample;
#ifdef TARGET_OS_Windows
if(_isnan(l_f64Sample))
#else
if(std::isnan(l_f64Sample))
#endif
if(std::isnan(l_f64Sample))
{
l_pBuffer[count+m_ui32SamplesPerBuffer] = (count != 0) ? l_pBuffer[count+m_ui32SamplesPerBuffer-1] : 0.0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment