Skip to content

Commit c2e1946

Browse files
committed
fix warning for certain compilers
1 parent cee74b9 commit c2e1946

1 file changed

Lines changed: 10 additions & 11 deletions

File tree

matplotlibcpp.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,9 @@ template <> struct select_npy_type<uint64_t> { const static NPY_TYPES type = NPY
350350

351351
// Sanity checks; comment them out or change the numpy type below if you're compiling on
352352
// a platform where they don't apply
353-
static_assert(sizeof(long long) == 8);
353+
static_assert(sizeof(long long) == 8, "size check failed");
354354
template <> struct select_npy_type<long long> { const static NPY_TYPES type = NPY_INT64; };
355-
static_assert(sizeof(unsigned long long) == 8);
355+
static_assert(sizeof(unsigned long long) == 8, "size check failed");
356356
template <> struct select_npy_type<unsigned long long> { const static NPY_TYPES type = NPY_UINT64; };
357357

358358
template<typename Numeric>
@@ -1057,8 +1057,7 @@ template<typename NumericX, typename NumericY, typename NumericColors>
10571057
if(res) Py_DECREF(res);
10581058

10591059
return res;
1060-
}
1061-
1060+
}
10621061

10631062
template<typename NumericX, typename NumericY, typename NumericZ>
10641063
bool scatter(const std::vector<NumericX>& x,
@@ -1069,9 +1068,9 @@ bool scatter(const std::vector<NumericX>& x,
10691068
const long fig_number=0) {
10701069
detail::_interpreter::get();
10711070

1072-
// Same as with plot_surface: We lazily load the modules here the first time
1073-
// this function is called because I'm not sure that we can assume "matplotlib
1074-
// installed" implies "mpl_toolkits installed" on all platforms, and we don't
1071+
// Same as with plot_surface: We lazily load the modules here the first time
1072+
// this function is called because I'm not sure that we can assume "matplotlib
1073+
// installed" implies "mpl_toolkits installed" on all platforms, and we don't
10751074
// want to require it for people who don't need 3d plots.
10761075
static PyObject *mpl_toolkitsmod = nullptr, *axis3dmod = nullptr;
10771076
if (!mpl_toolkitsmod) {
@@ -1468,7 +1467,7 @@ bool quiver(const std::vector<NumericX>& x, const std::vector<NumericY>& y, cons
14681467
Py_DECREF(axis3d);
14691468
if (!axis3dmod) { throw std::runtime_error("Error loading module mpl_toolkits.mplot3d!"); }
14701469
}
1471-
1470+
14721471
//assert sizes match up
14731472
assert(x.size() == y.size() && x.size() == u.size() && u.size() == w.size() && x.size() == z.size() && x.size() == v.size() && u.size() == v.size());
14741473

@@ -1496,7 +1495,7 @@ bool quiver(const std::vector<NumericX>& x, const std::vector<NumericY>& y, cons
14961495
{
14971496
PyDict_SetItemString(kwargs, it->first.c_str(), PyUnicode_FromString(it->second.c_str()));
14981497
}
1499-
1498+
15001499
//get figure gca to enable 3d projection
15011500
PyObject *fig =
15021501
PyObject_CallObject(detail::_interpreter::get().s_python_function_figure,
@@ -1516,7 +1515,7 @@ bool quiver(const std::vector<NumericX>& x, const std::vector<NumericY>& y, cons
15161515
Py_INCREF(axis);
15171516
Py_DECREF(gca);
15181517
Py_DECREF(gca_kwargs);
1519-
1518+
15201519
//plot our boys bravely, plot them strongly, plot them with a wink and clap
15211520
PyObject *plot3 = PyObject_GetAttrString(axis, "quiver");
15221521
if (!plot3) throw std::runtime_error("No 3D line plot");
@@ -2655,7 +2654,7 @@ inline void rcparams(const std::map<std::string, std::string>& keywords = {}) {
26552654
PyDict_SetItemString(kwargs, it->first.c_str(), PyLong_FromLong(std::stoi(it->second.c_str())));
26562655
else PyDict_SetItemString(kwargs, it->first.c_str(), PyString_FromString(it->second.c_str()));
26572656
}
2658-
2657+
26592658
PyObject * update = PyObject_GetAttrString(detail::_interpreter::get().s_python_function_rcparams, "update");
26602659
PyObject * res = PyObject_Call(update, args, kwargs);
26612660
if(!res) throw std::runtime_error("Call to rcParams.update() failed.");

0 commit comments

Comments
 (0)