diff --git a/CMakeLists.txt b/CMakeLists.txt index cc820fb6..7173420d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -205,7 +205,7 @@ fityk/data.cpp fityk/lexer.cpp fityk/runner.cpp fityk/vm.cpp fityk/eparser.cpp fityk/LMfit.cpp fityk/settings.cpp fityk/voigt.cpp fityk/f_fcjasym.cpp fityk/logic.cpp fityk/tplate.cpp fityk/fit.cpp fityk/luabridge.cpp fityk/transform.cpp -fityk/cmpfit/mpfit.c +fityk/cmpfit/mpfit.c fityk/root/background.cpp ${lua_runtime} ${lua_cxx}) if (DOWNLOAD_XYLIB) diff --git a/fityk/root/background.cpp b/fityk/root/background.cpp index f18bb323..563aed6d 100644 --- a/fityk/root/background.cpp +++ b/fityk/root/background.cpp @@ -453,7 +453,7 @@ std::vector ROOT::background(const std::vector spect int i, j, w, bw, b1, b2, priz; double a, b, c, d, e, yb1, yb2, ai, av, men, b4, c4, d4, e4, b6, c6, d6, e6, f6, g6, b8, c8, d8, e8, f8, g8, h8, i8; - const unsigned int ssize = spectrum.size(); + const int ssize = (int) spectrum.size(); if (ssize <= 0) throw fityk::ExecuteError("Wrong vector size"); diff --git a/fityk/transform.cpp b/fityk/transform.cpp index ce4f0ce7..168e06cb 100644 --- a/fityk/transform.cpp +++ b/fityk/transform.cpp @@ -109,7 +109,7 @@ struct vector_slice { // It returns the iterators to the begin of the active // slice (first active datapoint) and to the end of the // slice (datapoint *after* the last active one). -struct vector_slice first_active_slice(const vector &pp, +struct vector_slice first_active_slice(const vector &/*pp*/, vector::iterator begin, vector::iterator end) {