From owner-svn-ports-all@freebsd.org  Sun Sep 24 18:45:26 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17D79E2D388;
 Sun, 24 Sep 2017 18:45:26 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DB5D181646;
 Sun, 24 Sep 2017 18:45:25 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8OIjPXN081305;
 Sun, 24 Sep 2017 18:45:25 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8OIjPjS081304;
 Sun, 24 Sep 2017 18:45:25 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201709241845.v8OIjPjS081304@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Sun, 24 Sep 2017 18:45:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r450500 - head/biology/ssaha/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: head/biology/ssaha/files
X-SVN-Commit-Revision: 450500
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Sep 2017 18:45:26 -0000

Author: jbeich
Date: Sun Sep 24 18:45:24 2017
New Revision: 450500
URL: https://svnweb.freebsd.org/changeset/ports/450500

Log:
  biology/ssaha: unbreak with gcc7
  
  In file included from Binary/..//Global/SSAHAMain.cpp:51:0:
  Binary/..//Global/SSAHAMain.cpp: In function 'void processQuery(QueryParameterStruct&)':
  Binary/..//Global/SSAHAMain.cpp:968:23: error: ISO C++ forbids comparison between pointer and integer [-fpermissive]
       assert( pAligner!=false);
                         ^
  
  PR:		222542

Modified:
  head/biology/ssaha/files/patch-SSAHAMain.cpp   (contents, props changed)

Modified: head/biology/ssaha/files/patch-SSAHAMain.cpp
==============================================================================
--- head/biology/ssaha/files/patch-SSAHAMain.cpp	Sun Sep 24 18:45:08 2017	(r450499)
+++ head/biology/ssaha/files/patch-SSAHAMain.cpp	Sun Sep 24 18:45:24 2017	(r450500)
@@ -37,6 +37,15 @@
  
    cerr << "Info: will ignore hits on words that occur more than " 
         << queryParams.maxStore << " times in the database." << endl;
+@@ -964,7 +965,7 @@ delete pQueryMode;
+ 
+     } // ~else
+ 
+-    assert( pAligner!=false);
++    assert(pAligner!=NULL);
+ 
+     // ownership of *pAligner passes to *pPrintTask
+     pPrintTask = new MatchTaskAlign( *pQuery, *pSubjectSource, pAligner,
 @@ -1151,7 +1152,7 @@
      } // ~if
      dirent* dirEntry;