[94063] trunk/dports/textproc/sphinx

[jmr at macports.org]

Revision: 94063
          https://trac.macports.org/changeset/94063
Author:   jmr at macports.org
Date:     2012-06-08 01:31:25 -0700 (Fri, 08 Jun 2012)
Log Message:
-----------
sphinx: fix build with clang++ (#31666)

Modified Paths:
--------------
    trunk/dports/textproc/sphinx/Portfile

Added Paths:
-----------
    trunk/dports/textproc/sphinx/files/src_sphinxexpr.cpp.patch

Modified: trunk/dports/textproc/sphinx/Portfile
===================================================================
--- trunk/dports/textproc/sphinx/Portfile	2012-06-07 22:33:28 UTC (rev 94062)
+++ trunk/dports/textproc/sphinx/Portfile	2012-06-08 08:31:25 UTC (rev 94063)
@@ -27,7 +27,7 @@
 depends_lib		    port:expat \
                     port:libiconv
 
-patchfiles          endian.patch
+patchfiles          endian.patch src_sphinxexpr.cpp.patch
 
 configure.args      --mandir=${prefix}/share/man \
                     --datadir=${prefix}/share/doc \

Added: trunk/dports/textproc/sphinx/files/src_sphinxexpr.cpp.patch
===================================================================
--- trunk/dports/textproc/sphinx/files/src_sphinxexpr.cpp.patch	                        (rev 0)
+++ trunk/dports/textproc/sphinx/files/src_sphinxexpr.cpp.patch	2012-06-08 08:31:25 UTC (rev 94063)
@@ -0,0 +1,29 @@
+--- src/sphinxexpr.cpp.orig	2009-10-22 11:36:37.000000000 +1100
++++ src/sphinxexpr.cpp	2012-06-08 18:27:07.000000000 +1000
+@@ -1010,7 +1010,7 @@ public:
+ 	/// evaluate arg, return interval id
+ 	virtual int IntEval ( const CSphMatch & tMatch ) const
+ 	{
+-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
++		T val = Expr_ArgVsSet_c<T>::ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+ 		ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here
+ 			if ( val<this->m_dValues[i] )
+ 				return i;
+@@ -1044,7 +1044,7 @@ public:
+ 	/// evaluate arg, return interval id
+ 	virtual int IntEval ( const CSphMatch & tMatch ) const
+ 	{
+-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
++		T val = Expr_ArgVsSet_c<T>::ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+ 		ARRAY_FOREACH ( i, m_dTurnPoints )
+ 			if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) )
+ 				return i;
+@@ -1077,7 +1077,7 @@ public:
+ 	/// evaluate arg, check if the value is within set
+ 	virtual int IntEval ( const CSphMatch & tMatch ) const
+ 	{
+-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
++		T val = Expr_ArgVsSet_c<T>::ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
+ 		return this->m_dValues.BinarySearch ( val )!=NULL;
+ 	}
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120608/189a1065/attachment.html>