summaryrefslogtreecommitdiff
path: root/benchmarks/bonnie++/files/patch-duration.cpp
diff options
context:
space:
mode:
authorGanael LAPLANCHE <martymac@FreeBSD.org>2016-10-19 10:20:01 +0000
committerGanael LAPLANCHE <martymac@FreeBSD.org>2016-10-19 10:20:01 +0000
commita62e121b269698093a3ba93ff454312bfd7b6dd9 (patch)
tree4c52dc8b90a4615aa5ceff71f1edecf1ea56c2d4 /benchmarks/bonnie++/files/patch-duration.cpp
parentProvide a NEWVERDANA option (off by default) to install the y2006 (diff)
Update to 1.97.2
Diffstat (limited to 'benchmarks/bonnie++/files/patch-duration.cpp')
-rw-r--r--benchmarks/bonnie++/files/patch-duration.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/benchmarks/bonnie++/files/patch-duration.cpp b/benchmarks/bonnie++/files/patch-duration.cpp
index 7ba96bc261ed..3368eb7060de 100644
--- a/benchmarks/bonnie++/files/patch-duration.cpp
+++ b/benchmarks/bonnie++/files/patch-duration.cpp
@@ -1,12 +1,12 @@
---- duration.cpp.orig 2008-12-23 22:26:42 UTC
-+++ duration.cpp
+--- duration.cpp.orig 2016-06-30 09:41:58.000000000 +0000
++++ duration.cpp 2016-10-18 20:09:09.173611133 +0000
@@ -1,5 +1,3 @@
-using namespace std;
-
#include <stdlib.h>
#include "duration.h"
-@@ -20,6 +18,8 @@ using namespace std;
+@@ -20,6 +18,8 @@
#endif
#endif
@@ -15,12 +15,3 @@
Duration_Base::Duration_Base()
: m_start(0.0)
, m_max(0.0)
-@@ -38,7 +38,7 @@ double Duration_Base::stop()
- getTime(&tv);
- double ret;
- ret = tv - m_start;
-- m_max = __max(m_max, ret);
-+ m_max = max(m_max, ret);
- return ret;
- }
-