Date: Tue, 1 Oct 2013 12:20:26 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328939 - head/textproc/sphinxsearch-devel/files Message-ID: <201310011220.r91CKQ4p024933@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Oct 1 12:20:25 2013 New Revision: 328939 URL: http://svnweb.freebsd.org/changeset/ports/328939 Log: textproc/sphinxsearch-devel: Fix c++ scope issues Approved by: portmgr (bapt, implicit) Added: head/textproc/sphinxsearch-devel/files/patch-src_sphinxexpr.cpp (contents, props changed) Added: head/textproc/sphinxsearch-devel/files/patch-src_sphinxexpr.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/sphinxsearch-devel/files/patch-src_sphinxexpr.cpp Tue Oct 1 12:20:25 2013 (r328939) @@ -0,0 +1,29 @@ +--- src/sphinxexpr.cpp.orig 2011-03-11 17:43:11.000000000 +0000 ++++ src/sphinxexpr.cpp +@@ -1722,7 +1722,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 = this->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; +@@ -1753,7 +1753,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 = this->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; +@@ -1799,7 +1799,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 = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage + return this->m_dValues.BinarySearch ( val )!=NULL; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310011220.r91CKQ4p024933>