Control: tags -1 patch
Hi Maintainer The attached patch fixes the FTBFS with GCC 6. Regards Graham
Description: Fix FTBFS with GCC 6 Forwarded: no Bug-Debian: https://bugs.debian.org/811800 Author: Graham Inggs <gin...@debian.org> Last-Update: 2016-09-26 --- a/fityk/guess.cpp +++ b/fityk/guess.cpp @@ -20,9 +20,9 @@ namespace fityk { -const array<string, 3> Guess::linear_traits = +const boost::array<string, 3> Guess::linear_traits = {{ "slope", "intercept", "avgy" }}; -const array<string, 4> Guess::peak_traits = +const boost::array<string, 4> Guess::peak_traits = {{ "center", "height", "hwhm", "area" }}; Guess::Guess(Settings const *settings) : settings_(settings) @@ -105,7 +105,7 @@ // outputs vector with: center, height, hwhm, area // returns values corresponding to peak_traits -array<double,4> Guess::estimate_peak_parameters() +boost::array<double,4> Guess::estimate_peak_parameters() { // find the highest point, which must be higher than the previous point // and not lower than the next one (-> it cannot be the first/last point) @@ -132,11 +132,11 @@ double center = xx_[pos]; double area; double hwhm = find_hwhm(pos, &area) * settings_->width_correction; - array<double,4> r = {{ center, height, hwhm, area }}; + boost::array<double,4> r = {{ center, height, hwhm, area }}; return r; } -array<double,3> Guess::estimate_linear_parameters() +boost::array<double,3> Guess::estimate_linear_parameters() { double sx = 0, sy = 0, sxx = 0, /*syy = 0,*/ sxy = 0; int n = yy_.size(); @@ -152,7 +152,7 @@ double slope = (n * sxy - sx * sy) / (n * sxx - sx * sx); double intercept = (sy - slope * sx) / n; double avgy = sy / n; - array<double,3> r = {{ slope, intercept, avgy }}; + boost::array<double,3> r = {{ slope, intercept, avgy }}; return r; } --- a/wxgui/frame.cpp +++ b/wxgui/frame.cpp @@ -1028,7 +1028,7 @@ return; } try { - shared_ptr<const xylib::DataSet> d = + std::tr1::shared_ptr<const xylib::DataSet> d = xylib::cached_load_file(f, "", ""); if (d->get_block_count() > 1) { wxArrayString choices;
