Commit d94bd9ba authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Minor fixes for old compilers

parent 7571de41
......@@ -5,6 +5,7 @@
#include <memory>
#include <valarray>
#include <vector>
#include <algorithm>
// API includes
#include <ITA/SimulationScheduler/definitions.h>
......@@ -18,6 +19,7 @@
#include <VistaBase/VistaVector3D.h>
#include <VistaBase/VistaQuaternion.h>
namespace ITA
{
namespace SimulationScheduler
......@@ -137,7 +139,7 @@ namespace ITA
for ( const auto& values : data )
{
globalPeak = std::max ( globalPeak, abs ( values ).max ( ) );
globalPeak = (std::max)( globalPeak, abs( values ).max() );
}
irs.mul_scalar ( 1 / globalPeak );
......@@ -148,7 +150,7 @@ namespace ITA
{
const auto nx = x.GetLength ( );
const auto ny = y.GetLength ( );
const auto m = std::max ( nx, ny );
const auto m = (std::max)( nx, ny );
const auto mxl = m - 1;
// extend data
......@@ -215,7 +217,7 @@ namespace ITA
{
const auto nx = x.size ( );
const auto ny = y.size ( );
const auto m = std::max ( nx, ny );
const auto m = (std::max)( nx, ny );
const auto mxl = m - 1;
auto X = FFTUtils::FFT ( x, 2 * m );
......
......@@ -42,7 +42,7 @@ namespace ITA
///
/// \brief Constructor for a CUpdateScene.
///
/// This constrictor initializes the ID to the next free ID and source and receiver to nullptrs.
/// This constructor initializes the ID to the next free ID and source and receiver to nullptrs.
/// \param referenceID the reference ID for the update.
///
explicit CUpdateScene ( unsigned int referenceID );
......
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