[pktools] 04/07: Drop patch applied upstream, refresh remaining patch.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pktools.

commit 78691e532e41f684171a1583b35446b019d6e617
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jun 30 21:01:50 2015 +0200

    Drop patch applied upstream, refresh remaining patch.
---
 debian/changelog                                   |  1 +
 ...eclaration-may-not-have-default-arguments.patch | 63 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e6f116..3e27d6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pktools (2.6.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patch applied upstream, refresh remaining patch.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 30 Jun 2015 20:50:42 +0200
 
diff --git a/debian/patches/redeclaration-may-not-have-default-arguments.patch b/debian/patches/redeclaration-may-not-have-default-arguments.patch
deleted file mode 100644
index 99329bc..0000000
--- a/debian/patches/redeclaration-may-not-have-default-arguments.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Don't use default arguments in redeclaration.
- The 'Porting to GCC 4.9' guide documents the following:
- "
-  Default arguments on redeclaration of member function of class template now rejected
-
-  GCC by default no longer accepts code such as:
-
-   template<class T>
-   struct A
-   {
-     void f(int);
-   };
-
-   template<class T>
-   void A<T>::f(int i=0) { }
-
-  This example now gives the following diagnostic:
-
-   r.cc:8:21: error: redeclaration of ‘void A<T>::f(int)’ may not have default arguments [-fpermissive]
-
-  The standard says the example is ill-formed, so GCC was changed to reject it for PR54485.
-  To fix the error the default argument must appear when the member function is first declared.
- "
- https://gcc.gnu.org/gcc-4.9/porting_to.html
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/778065
-Forwarded: https://savannah.nongnu.org/bugs/?45416
-Applied-Upstream: http://git.savannah.gnu.org/cgit/pktools.git/commit/?id=83fa6c2677af3a443052e4602feed547c8614803
-
---- a/src/algorithms/FeatureSelector.h
-+++ b/src/algorithms/FeatureSelector.h
-@@ -37,7 +37,7 @@ class FeatureSelector
-  public:
-   FeatureSelector(){};
-   ~FeatureSelector(){};
--  template<class T> double forward(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures, short verbose=0);
-+  template<class T> double forward(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures=0, short verbose=0);
-   template<class T> double backward(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int minFeatures, short verbose=0);
-   template<class T> double floating(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures=0, double epsilon=0.001, short verbose=0);
-   template<class T> double bruteForce(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures=0, short verbose=0);
-@@ -45,11 +45,11 @@ class FeatureSelector
-   private:
-     template<class T> double addFeature(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, short verbose=0);
-   template<class T> double removeFeature(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int& r, short verbose=0);  
--  template<class T> double forwardUnivariate(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures, short verbose=0);
-+  template<class T> double forwardUnivariate(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures=0, short verbose=0);
- };
- 
- //sequential forward selection Univariate (N single best features)
--template<class T> double FeatureSelector::forwardUnivariate(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures=0, short verbose){
-+template<class T> double FeatureSelector::forwardUnivariate(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures, short verbose){
-   int maxLevels=v[0][0].size();
-   if(!maxFeatures)
-     maxFeatures=maxLevels;
-@@ -108,7 +108,7 @@ template<class T> double FeatureSelector
- }
- 
- //sequential forward selection Multivariate (Combination of N best features)
--template<class T> double FeatureSelector::forward(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures=0, short verbose){
-+template<class T> double FeatureSelector::forward(std::vector< Vector2d<T> >& v, CostFactory& theCostFactory, std::list<int>& subset, int maxFeatures, short verbose){
-   //Select feature with the best value (get maximal cost for 1 feature)
-   double maxCost=0;
-   int maxLevels=v[0][0].size();
diff --git a/debian/patches/series b/debian/patches/series
index 2bef6d8..e9e0975 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 automake-subdir-objects.patch
-redeclaration-may-not-have-default-arguments.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git