← Back to branch summary

~ubuntu-branches/ubuntu/vivid/sphinxsearch/vivid

« back to all changes in this revision

Viewing changes to debian/patches/05_gcc4.7.patch

  • Committer: Package Import Robot
  • Author(s): Nicholas Bamber
  • Date: 2012-06-11 20:31:53 UTC
  • mfrom: (7.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20120611203153-riiy1hm0i31njiyv
Tags: 2.0.4-1.1
http://bugs.debian.org/676595
* Non-maintainer upload.
* Removed hard-coded dependency on libmysqlclient16 (Closes: #676595)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_gcc4.7.patch
 
1
Author: Cyril Brulebois <kibi@debian.org>
 
2
Description: gcc-4.7 fix ( #667378 )
 
3
--- a/src/sphinxexpr.cpp
 
4
+++ b/src/sphinxexpr.cpp
 
5
@@ -1796,7 +1796,7 @@ public:
 
6
        /// evaluate arg, return interval id
 
7
        virtual int IntEval ( const CSphMatch & tMatch ) const
 
8
        {
 
9
-               T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
 
10
+               T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
 
11
                ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here
 
12
                        if ( val<this->m_dValues[i] )
 
13
                                return i;
 
14
@@ -1827,7 +1827,7 @@ public:
 
15
        /// evaluate arg, return interval id
 
16
        virtual int IntEval ( const CSphMatch & tMatch ) const
 
17
        {
 
18
-               T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
 
19
+               T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
 
20
                ARRAY_FOREACH ( i, m_dTurnPoints )
 
21
                        if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) )
 
22
                                return i;
 
23
@@ -1873,7 +1873,7 @@ public:
 
24
        /// evaluate arg, check if the value is within set
 
25
        virtual int IntEval ( const CSphMatch & tMatch ) const
 
26
        {
 
27
-               T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
 
28
+               T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
 
29
                return this->m_dValues.BinarySearch ( val )!=NULL;
 
30
        }
 
31