Attachment #141780 for bug #188678

Lines 14-20 Link Here

(-)benchmarks/bonnie++/Makefile (-1 lines)
14	LICENSE= GPLv2	14	LICENSE= GPLv2
15		15
16	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
17	USE_GCC= any
18		17
19	USES= shebangfix	18	USES= shebangfix
20	SHEBANG_FILES= bon_csv2txt.in	19	SHEBANG_FILES= bon_csv2txt.in




--- bonnie.h.in.orig    2009-08-21 18:45:50.068536643 +0000
+++ bonnie.h.in 2009-08-21 18:45:58.564755017 +0000
@@ -1,8 +1,6 @@
 #ifndef BONNIE
 #define BONNIE
 
-using namespace std;
-
 #define BON_VERSION "@version@"
 #define CSV_VERSION "@csv_version@"
 
@@ -12,6 +10,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+using namespace std;
+
 typedef FILE *PFILE;
 
 #define SemKey 4711




--- duration.cpp.orig   2009-08-21 18:45:50.068536643 +0000
+++ duration.cpp        2009-08-21 18:45:58.564755017 +0000
@@ -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)




--- port.h.in.orig	2009-08-21 18:45:50.068536643 +0000
+++ port.h.in	2009-08-21 18:45:58.564755017 +0000
@@ -4,12 +4,12 @@
 
 #include "conf.h"
 
 #ifndef HAVE_MIN_MAX
-#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO)
-#ifdef HAVE_ALGO
+#if defined(HAVE_ALGORITHM)
+#include <algorithm>
+#elif defined(HAVE_ALGO)
 #include <algo>
-#else
+#elif defined(HAVE_ALGO_H)
 #include <algo.h>
-#endif
 #else
 #define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
 #define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
@@ -19,14 +19,7 @@
 @semun@
 @bool@
 @snprintf@
-#ifndef _LARGEFILE64_SOURCE
-@large_file@
-#endif
-#ifdef _LARGEFILE64_SOURCE
-#define OFF_T_PRINTF "%lld"
-#else
-#define OFF_T_PRINTF "%d"
-#endif
+#define OFF_T_PRINTF "%ld"
 
 #if @true_false@
 #define false 0




--- rand.h.orig 2009-08-21 18:45:50.068536643 +0000
+++ rand.h      2009-08-21 18:45:58.564755017 +0000
@@ -1,11 +1,11 @@
 #ifndef RAND_H
 #define RAND_H
 
-using namespace std;
 #include "port.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
+using namespace std;
 
 class Rand
 {

Return to bug 188678

Line 0 Link Here

(-)benchmarks/bonnie++/files/patch-bonnie.h.in (+20 lines)
	1	--- bonnie.h.in.orig 2009-08-21 18:45:50.068536643 +0000
	2	+++ bonnie.h.in 2009-08-21 18:45:58.564755017 +0000
	3	@@ -1,8 +1,6 @@
	4	#ifndef BONNIE
	5	#define BONNIE
	6
	7	-using namespace std;
	8	-
	9	#define BON_VERSION "@version@"
	10	#define CSV_VERSION "@csv_version@"
	11
	12	@@ -12,6 +10,8 @@
	13	#include <sys/stat.h>
	14	#include <fcntl.h>
	15
	16	+using namespace std;
	17	+
	18	typedef FILE *PFILE;
	19
	20	#define SemKey 4711

Line 0 Link Here

(-)benchmarks/bonnie++/files/patch-duration.cpp (+17 lines)
	1	--- duration.cpp.orig 2009-08-21 18:45:50.068536643 +0000
	2	+++ duration.cpp 2009-08-21 18:45:58.564755017 +0000
	3	@@ -1,5 +1,3 @@
	4	-using namespace std;
	5	-
	6	#include <stdlib.h>
	7
	8	#include "duration.h"
	9	@@ -20,6 +18,8 @@
	10	#endif
	11	#endif
	12
	13	+using namespace std;
	14	+
	15	Duration_Base::Duration_Base()
	16	: m_start(0.0)
	17	, m_max(0.0)

Lines 1-21 Link Here

(-)benchmarks/bonnie++/files/patch-port.h.in (-8 / +22 lines)
1	--- port.h.in.orig 2009-08-21 18:45:50.068536643 +0000	1	--- port.h.in.orig 2009-08-21 18:45:50.068536643 +0000
2	+++ port.h.in 2009-08-21 18:45:58.564755017 +0000	2	+++ port.h.in 2009-08-21 18:45:58.564755017 +0000
3	@@ -3,18 +3,8 @@	3	@@ -4,12 +4,12 @@
4
5	#include "conf.h"	4	#include "conf.h"
6		5
7	-#ifndef HAVE_MIN_MAX	6	#ifndef HAVE_MIN_MAX
8	-#if defined(HAVE_ALGO_H) \|\| defined(HAVE_ALGO)	7	-#if defined(HAVE_ALGO_H) \|\| defined(HAVE_ALGO)
9	-#ifdef HAVE_ALGO	8	-#ifdef HAVE_ALGO
10	-#include <algo>	9	+#if defined(HAVE_ALGORITHM)
		10	+#include <algorithm>
		11	+#elif defined(HAVE_ALGO)
		12	#include <algo>
11	-#else	13	-#else
12	-#include <algo.h>	14	+#elif defined(HAVE_ALGO_H)
		15	#include <algo.h>
13	-#endif	16	-#endif
14	-#else	17	#else
15	#define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))	18	#define min(XX,YY) ((XX) < (YY) ? (XX) : (YY))
16	#define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))	19	#define max(XX,YY) ((XX) > (YY) ? (XX) : (YY))
		20	@@ -19,14 +19,7 @@
		21	@semun@
		22	@bool@
		23	@snprintf@
		24	-#ifndef _LARGEFILE64_SOURCE
		25	-@large_file@
17	-#endif	26	-#endif
		27	-#ifdef _LARGEFILE64_SOURCE
		28	-#define OFF_T_PRINTF "%lld"
		29	-#else
		30	-#define OFF_T_PRINTF "%d"
18	-#endif	31	-#endif
		32	+#define OFF_T_PRINTF "%ld"
19		33
20	@semun@	34	#if @true_false@
21	@bool@	35	#define false 0

Line 0 Link Here

(-)benchmarks/bonnie++/files/patch-rand.h (+15 lines)
	1	--- rand.h.orig 2009-08-21 18:45:50.068536643 +0000
	2	+++ rand.h 2009-08-21 18:45:58.564755017 +0000
	3	@@ -1,11 +1,11 @@
	4	#ifndef RAND_H
	5	#define RAND_H
	6
	7	-using namespace std;
	8	#include "port.h"
	9	#include <stdio.h>
	10	#include <stdlib.h>
	11	#include <string>
	12	+using namespace std;
	13
	14	class Rand
	15	{