From owner-svn-ports-head@FreeBSD.ORG Tue Oct 1 12:20:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 74C8CCAF; Tue, 1 Oct 2013 12:20:26 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6272426B0; Tue, 1 Oct 2013 12:20:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r91CKQn7024934; Tue, 1 Oct 2013 12:20:26 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r91CKQ4p024933; Tue, 1 Oct 2013 12:20:26 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201310011220.r91CKQ4p024933@svn.freebsd.org> From: John Marino Date: Tue, 1 Oct 2013 12:20:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328939 - head/textproc/sphinxsearch-devel/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Oct 2013 12:20:26 -0000 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 ( valm_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::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; + } +