--- duration.cpp.orig 2008-12-23 23:26:42.000000000 +0100 +++ duration.cpp 2014-05-10 12:04:40.000000000 +0200 @@ -1,5 +1,3 @@ -using namespace std; - #include #include "duration.h" @@ -20,6 +18,8 @@ #endif #endif +using namespace std; + Duration_Base::Duration_Base() : m_start(0.0) , m_max(0.0) @@ -38,7 +38,7 @@ getTime(&tv); double ret; ret = tv - m_start; - m_max = __max(m_max, ret); + m_max = max(m_max, ret); return ret; }