From c2531ad7f2dc7bfae6357bacc28e7f6a3591d48d Mon Sep 17 00:00:00 2001
From: francesco-ST <francesco.abbate@st.com>
Date: 2010年10月21日 14:01:03 +0200
Subject: minor C++ config fix
---
 agg-plot/utils.h &#124; 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)
(limited to 'agg-plot/utils.h')
diff --git a/agg-plot/utils.h b/agg-plot/utils.h
index eec7d492..b68d3bed 100644
--- a/agg-plot/utils.h
+++ b/agg-plot/utils.h
@@ -1,18 +1,28 @@
 #ifndef AGGPLOT_UTILS_H
 #define AGGPLOT_UTILS_H
 
-#include <string>
 #include "agg_trans_affine.h"
 
-template <class T>
-T max (T a, T b) {
- return (b < a) ? a : b; -} +#ifdef min +#undef min +#endif + +#ifdef max +#undef max +#endif + + +template <typename T>
+T min(T a, T b)
+{
+ return (a < b) ? a : b; +}; -template <class T>
-T min (T a, T b) {
- return (b> a) ? a : b;
-}
+template <typename T>
+T max(T a, T b)
+{
+ return (a> b) ? a : b;
+};
 
 extern void trans_affine_compose (agg::trans_affine& a, 
 				 const agg::trans_affine& b);
-- 
cgit v1.2.3
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://cgit.git.savannah.gnu.org/cgit/gsl-shell.git/patch/agg-plot/utils.h?id=c2531ad7f2dc7bfae6357bacc28e7f6a3591d48d">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://cgit.git.savannah.gnu.org/cgit/gsl-shell.git/patch/agg-plot/utils.h?id=c2531ad7f2dc7bfae6357bacc28e7f6a3591d48d" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>