blob: c728a21af41117395d43af8b6a048f14b47e24f2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
--- 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 <stdlib.h>
#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;
}
|