Commit 1c44592a authored by Dave Moxey's avatar Dave Moxey
Browse files

Avoid issue with min/max macro

parent 9c2c49b3
......@@ -38,6 +38,7 @@
#define NEKTAR_LIB_UTILITIES_BASIC_UTILS_TIMER_H
#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#else
#include <sys/time.h>
......
......@@ -195,7 +195,7 @@ namespace Nektar
for(i = 0; i < m_base.num_elements(); ++i)
{
returnval = (std::max)(returnval, m_base[i]->GetNumModes());
returnval = std::max(returnval, m_base[i]->GetNumModes());
}
return returnval;
......
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