Skip to content

Commit 274bb9f

Browse files
perazzperazz
authored
Fix C++ compiler warnings (#29)
2 parents 94a340c + c7e48b9 commit 274bb9f

File tree

6 files changed

+28
-28
lines changed

6 files changed

+28
-28
lines changed

‎include/fitpack_core_c.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ inline vector<FP_REAL> flatten_2d_vector(const vector<fpPoint>& x2d) {
256256
for (const auto& p : x2d) ndim = std::max(ndim, static_cast<FP_SIZE>(p.size()));
257257

258258
vector<FP_REAL> x(x2d.size() * ndim, 0.0);
259-
for (FP_SIZE i = 0; i < x2d.size(); i++)
259+
for (FP_SIZE i = 0; i < (FP_SIZE)x2d.size(); i++)
260260
copy(x2d[i].begin(), x2d[i].end(), x.begin() + i * ndim);
261261

262262
return x;

‎include/fpClosedCurve.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ class fpClosedCurve
8383
FP_FLAG interpolate() { return fitpack_closed_curve_c_interpolating(&cptr); }
8484

8585
// Fit properties
86-
const FP_SIZE degree () { return fitpack_closed_curve_c_degree(&cptr); };
87-
const FP_REAL smoothing() { return fitpack_closed_curve_c_smoothing(&cptr); };
88-
const FP_REAL mse () { return fitpack_closed_curve_c_mse(&cptr); };
89-
const FP_SIZE ndim () { return fitpack_closed_curve_c_idim(&cptr); };
90-
const FP_REAL ubegin () { return fitpack_closed_curve_c_ubegin(&cptr); };
91-
const FP_REAL uend () { return fitpack_closed_curve_c_uend(&cptr); };
86+
FP_SIZE degree () { return fitpack_closed_curve_c_degree(&cptr); };
87+
FP_REAL smoothing() { return fitpack_closed_curve_c_smoothing(&cptr); };
88+
FP_REAL mse () { return fitpack_closed_curve_c_mse(&cptr); };
89+
FP_SIZE ndim () { return fitpack_closed_curve_c_idim(&cptr); };
90+
FP_REAL ubegin () { return fitpack_closed_curve_c_ubegin(&cptr); };
91+
FP_REAL uend () { return fitpack_closed_curve_c_uend(&cptr); };
9292

9393
// Get value at u
9494
fpPoint eval(FP_REAL u, FP_FLAG* ierr=nullptr)
@@ -106,7 +106,7 @@ class fpClosedCurve
106106
fpPoint y1(fitpack_closed_curve_c_idim(&cptr),0.0);
107107
vector<fpPoint> y(u.size(),y1);
108108

109-
for (FP_SIZE i=0; i<u.size(); i++)
109+
for (FP_SIZE i=0; i<static_cast<FP_SIZE>(u.size()); i++)
110110
{
111111
y[i] = eval(u[i],&ierr0);
112112
if (!FITPACK_SUCCESS_c(ierr0)) break;

‎include/fpConstrainedCurve.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ class fpConstrainedCurve
8484
FP_FLAG interpolate() { return fitpack_constrained_curve_c_interpolating(&cptr); }
8585

8686
// Fit properties
87-
const FP_SIZE degree () { return fitpack_constrained_curve_c_degree(&cptr); };
88-
const FP_REAL smoothing() { return fitpack_constrained_curve_c_smoothing(&cptr); };
89-
const FP_REAL mse () { return fitpack_constrained_curve_c_mse(&cptr); };
90-
const FP_SIZE ndim () { return fitpack_constrained_curve_c_idim(&cptr); };
91-
const FP_REAL ubegin () { return fitpack_constrained_curve_c_ubegin(&cptr); };
92-
const FP_REAL uend () { return fitpack_constrained_curve_c_uend(&cptr); };
87+
FP_SIZE degree () { return fitpack_constrained_curve_c_degree(&cptr); };
88+
FP_REAL smoothing() { return fitpack_constrained_curve_c_smoothing(&cptr); };
89+
FP_REAL mse () { return fitpack_constrained_curve_c_mse(&cptr); };
90+
FP_SIZE ndim () { return fitpack_constrained_curve_c_idim(&cptr); };
91+
FP_REAL ubegin () { return fitpack_constrained_curve_c_ubegin(&cptr); };
92+
FP_REAL uend () { return fitpack_constrained_curve_c_uend(&cptr); };
9393

9494
// Set constraints, begin point only
9595
FP_FLAG constrain_begin(vector<fpPoint> ddx_begin)
@@ -136,7 +136,7 @@ class fpConstrainedCurve
136136
fpPoint y1(fitpack_constrained_curve_c_idim(&cptr),0.0);
137137
vector<fpPoint> y(u.size(),y1);
138138

139-
for (FP_SIZE i=0; i<u.size(); i++)
139+
for (FP_SIZE i=0; i<static_cast<FP_SIZE>(u.size()); i++)
140140
{
141141
y[i] = eval(u[i],&ierr0);
142142
if (!FITPACK_SUCCESS_c(ierr0)) break;

‎include/fpCurve.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ class fpCurve
6767
FP_FLAG interpolate(FP_SIZE order) { return fitpack_curve_c_interpolating(&cptr,&order); }
6868

6969
// Fit properties
70-
const FP_SIZE degree () { return fitpack_curve_c_degree(&cptr); };
71-
const FP_REAL smoothing() { return fitpack_curve_c_smoothing(&cptr); };
72-
const FP_REAL mse () { return fitpack_curve_c_mse(&cptr); };
70+
FP_SIZE degree () { return fitpack_curve_c_degree(&cptr); };
71+
FP_REAL smoothing() { return fitpack_curve_c_smoothing(&cptr); };
72+
FP_REAL mse () { return fitpack_curve_c_mse(&cptr); };
7373

7474
// Get value at x
7575
FP_REAL eval(FP_REAL x, FP_SIZE* ierr=nullptr)

‎include/fpParametricCurve.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ class fpParametricCurve
8383
FP_FLAG interpolate(FP_SIZE order) { return fitpack_parametric_curve_c_interpolating(&cptr,nullptr); }
8484

8585
// Fit properties
86-
const FP_SIZE degree () { return fitpack_parametric_curve_c_degree(&cptr); };
87-
const FP_REAL smoothing() { return fitpack_parametric_curve_c_smoothing(&cptr); };
88-
const FP_REAL mse () { return fitpack_parametric_curve_c_mse(&cptr); };
89-
const FP_SIZE ndim () { return fitpack_parametric_curve_c_idim(&cptr); };
90-
const FP_REAL ubegin () const { return fitpack_parametric_curve_c_ubegin(&cptr);} ;
91-
const FP_REAL uend () const { return fitpack_parametric_curve_c_uend(&cptr); };
86+
FP_SIZE degree () { return fitpack_parametric_curve_c_degree(&cptr); };
87+
FP_REAL smoothing() { return fitpack_parametric_curve_c_smoothing(&cptr); };
88+
FP_REAL mse () { return fitpack_parametric_curve_c_mse(&cptr); };
89+
FP_SIZE ndim () { return fitpack_parametric_curve_c_idim(&cptr); };
90+
FP_REAL ubegin () const { return fitpack_parametric_curve_c_ubegin(&cptr);} ;
91+
FP_REAL uend () const { return fitpack_parametric_curve_c_uend(&cptr); };
9292

9393
FP_REAL& ubegin() { return *fitpack_parametric_curve_c_ubegin_ref(&cptr); };
9494
FP_REAL& uend() { return *fitpack_parametric_curve_c_uend_ref(&cptr); };
@@ -111,7 +111,7 @@ class fpParametricCurve
111111
fpPoint y1(fitpack_parametric_curve_c_idim(&cptr),0.0);
112112
vector<fpPoint> y(u.size(),y1);
113113

114-
for (FP_SIZE i=0; i<u.size(); i++)
114+
for (FP_SIZE i=0; i<static_cast<FP_SIZE>(u.size()); i++)
115115
{
116116
y[i] = eval(u[i],&ierr0);
117117
if (!FITPACK_SUCCESS_c(ierr0)) break;

‎include/fpPeriodicCurve.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ class fpPeriodicCurve
6666
FP_FLAG interpolate() { return fitpack_periodic_curve_c_interpolating(&cptr); }
6767

6868
// Fit properties
69-
const FP_SIZE degree () { return fitpack_periodic_curve_c_degree(&cptr); };
70-
const FP_REAL smoothing() { return fitpack_periodic_curve_c_smoothing(&cptr); };
71-
const FP_REAL mse () { return fitpack_periodic_curve_c_mse(&cptr); };
69+
FP_SIZE degree () { return fitpack_periodic_curve_c_degree(&cptr); };
70+
FP_REAL smoothing() { return fitpack_periodic_curve_c_smoothing(&cptr); };
71+
FP_REAL mse () { return fitpack_periodic_curve_c_mse(&cptr); };
7272

7373
// Get value at x
7474
FP_REAL eval(FP_REAL x, FP_SIZE* ierr=nullptr)

0 commit comments

Comments
 (0)