Date: Mon, 12 May 2014 14:01:42 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353824 - in head/security/clamav: . files Message-ID: <201405121401.s4CE1gBS050824@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Mon May 12 14:01:42 2014 New Revision: 353824 URL: http://svnweb.freebsd.org/changeset/ports/353824 QAT: https://qat.redports.org/buildarchive/r353824/ Log: Re-add a patch that I accidentaly removed on last commit, and bump PORTREVISION Added: head/security/clamav/files/patch-libclamav-c++-llvm (contents, props changed) Modified: head/security/clamav/Makefile Modified: head/security/clamav/Makefile ============================================================================== --- head/security/clamav/Makefile Mon May 12 13:56:46 2014 (r353823) +++ head/security/clamav/Makefile Mon May 12 14:01:42 2014 (r353824) @@ -3,6 +3,7 @@ PORTNAME= clamav PORTVERSION= 0.98.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF Added: head/security/clamav/files/patch-libclamav-c++-llvm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/clamav/files/patch-libclamav-c++-llvm Mon May 12 14:01:42 2014 (r353824) @@ -0,0 +1,62 @@ +--- libclamav/c++/llvm/include/llvm/Support/CFG.h.orig ++++ libclamav/c++/llvm/include/llvm/Support/CFG.h +@@ -27,8 +27,9 @@ + + template <class Ptr, class USE_iterator> // Predecessor Iterator + class PredIterator : public std::iterator<std::forward_iterator_tag, +- Ptr, ptrdiff_t> { +- typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t> super; ++ Ptr, ptrdiff_t, Ptr*, Ptr*> { ++ typedef std::iterator<std::forward_iterator_tag, Ptr, ptrdiff_t, Ptr*, ++ Ptr*> super; + typedef PredIterator<Ptr, USE_iterator> Self; + USE_iterator It; + +@@ -40,6 +41,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + + PredIterator() {} + explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) { +@@ -50,7 +52,7 @@ + inline bool operator==(const Self& x) const { return It == x.It; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { ++ inline reference operator*() const { + assert(!It.atEnd() && "pred_iterator out of range!"); + return cast<TerminatorInst>(*It)->getParent(); + } +@@ -100,10 +102,11 @@ + + template <class Term_, class BB_> // Successor Iterator + class SuccIterator : public std::iterator<std::bidirectional_iterator_tag, +- BB_, ptrdiff_t> { ++ BB_, ptrdiff_t, BB_*, BB_*> { + const Term_ Term; + unsigned idx; +- typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t> super; ++ typedef std::iterator<std::bidirectional_iterator_tag, BB_, ptrdiff_t, BB_*, ++ BB_*> super; + typedef SuccIterator<Term_, BB_> Self; + + inline bool index_is_valid(int idx) { +@@ -112,6 +115,7 @@ + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + // TODO: This can be random access iterator, only operator[] missing. + + explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator +@@ -142,7 +146,7 @@ + inline bool operator==(const Self& x) const { return idx == x.idx; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { return Term->getSuccessor(idx); } ++ inline reference operator*() const { return Term->getSuccessor(idx); } + inline pointer operator->() const { return operator*(); } + + inline Self& operator++() { ++idx; return *this; } // Preincrement
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405121401.s4CE1gBS050824>