<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128610] trunk/dports/benchmarks/bonniexx</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128610">128610</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2014-11-24 03:09:21 -0800 (Mon, 24 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>benchmarks/bonniexx:
Fix build on Yosemite due to clang throwing errors on min()/max() used in C++.
Not incrementing revision since this change should not change any linkage.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsbenchmarksbonniexxPortfile">trunk/dports/benchmarks/bonniexx/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsbenchmarksbonniexxfilespatchminmaxdiff">trunk/dports/benchmarks/bonniexx/files/patch-minmax.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsbenchmarksbonniexxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/benchmarks/bonniexx/Portfile (128609 => 128610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/benchmarks/bonniexx/Portfile 2014-11-24 11:00:07 UTC (rev 128609)
+++ trunk/dports/benchmarks/bonniexx/Portfile 2014-11-24 11:09:21 UTC (rev 128610)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx"> patch-port.h.in \
</span><span class="cx"> patch-zcav.8 \
</span><span class="cx"> patch-zcav.cpp \
</span><del>- patch-zcav_io.cpp
</del><ins>+ patch-zcav_io.cpp \
+ patch-minmax.diff
</ins><span class="cx">
</span><span class="cx"> worksrcdir ${distname}.1
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsbenchmarksbonniexxfilespatchminmaxdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/benchmarks/bonniexx/files/patch-minmax.diff (0 => 128610)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/benchmarks/bonniexx/files/patch-minmax.diff (rev 0)
+++ trunk/dports/benchmarks/bonniexx/files/patch-minmax.diff 2014-11-24 11:09:21 UTC (rev 128610)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+--- bonnie++.cpp.orig 2014-11-24 11:57:57.000000000 +0100
++++ bonnie++.cpp 2014-11-24 11:59:50.000000000 +0100
+@@ -73,7 +73,7 @@
+ void set_io_chunk_size(int size)
+ { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; }
+ void set_file_chunk_size(int size)
+- { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
++ { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
+
+ // Return the page-aligned version of the local buffer
+ char *buf() { return m_buf_pa; }
+@@ -138,7 +138,7 @@
+ , m_buf(NULL)
+ , m_buf_pa(NULL)
+ {
+- pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
++ pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
+ SetName(".");
+ }
+
+@@ -380,8 +380,8 @@
+ if(file_size % 1024 > 512)
+ file_size = file_size + 1024 - (file_size % 1024);
+ }
+- globals.byte_io_size = __min(file_size, globals.byte_io_size);
+- globals.byte_io_size = __max(0, globals.byte_io_size);
++ globals.byte_io_size = min(file_size, globals.byte_io_size);
++ globals.byte_io_size = max(0, globals.byte_io_size);
+
+ if(machine == NULL)
+ {
+--- duration.cpp.orig 2014-11-24 12:02:36.000000000 +0100
++++ duration.cpp 2014-11-24 12:02:39.000000000 +0100
+@@ -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;
+ }
+
+--- port.h.in.orig 2014-11-24 11:59:19.000000000 +0100
++++ port.h.in 2014-11-24 11:59:28.000000000 +0100
+@@ -39,8 +39,6 @@
+ #endif
+
+ typedef int FILE_TYPE;
+-#define __min min
+-#define __max max
+ typedef unsigned int UINT;
+ typedef unsigned long ULONG;
+ typedef const char * PCCHAR;
</ins></span></pre>
</div>
</div>
</body>
</html>