Merge pull request #10775 from QuLogic/gcc8-warnings

dopplershift · web-flow · commit 3ef352fa136f · 2018-03-14T19:33:40.000-06:00
Fix new warnings with gcc8
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,9 +1,8 @@
 include INSTALL.rst README.rst
-include CONTRIBUTING.md
 include pytest.ini
-include Makefile MANIFEST.in
+include MANIFEST.in
 include matplotlibrc.template setup.cfg.template
-include setupext.py setup.py distribute_setup.py
+include setupext.py setup.py
 include lib/matplotlib/mpl-data/lineprops.glade
 include lib/matplotlib/mpl-data/matplotlibrc
 include lib/matplotlib/mpl-data/images/*
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -441,15 +441,15 @@ static PyObject *Py_affine_transform(PyObject *self, PyObject *args, PyObject *k
         numpy::array_view<double, 2> result(dims);
         CALL_CPP("affine_transform", (affine_transform_2d(vertices, trans, result)));
         return result.pyobj();
-    } catch (py::exception) {
+    } catch (py::exception &) {
         PyErr_Clear();
         try {
             numpy::array_view<double, 1> vertices(vertices_obj);
             npy_intp dims[] = { (npy_intp)vertices.size() };
             numpy::array_view<double, 1> result(dims);
             CALL_CPP("affine_transform", (affine_transform_1d(vertices, trans, result)));
             return result.pyobj();
-        } catch (py::exception) {
+        } catch (py::exception &) {
             return NULL;
         }
     }
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -167,7 +167,7 @@ int convert_rect(PyObject *rectobj, void *rectp)
             rect->x2 = rect_arr(1, 0);
             rect->y2 = rect_arr(1, 1);
         }
-        catch (py::exception)
+        catch (py::exception &)
         {
             PyErr_Clear();
 
@@ -185,7 +185,7 @@ int convert_rect(PyObject *rectobj, void *rectp)
                 rect->x2 = rect_arr(2);
                 rect->y2 = rect_arr(3);
             }
-            catch (py::exception)
+            catch (py::exception &)
             {
                 return 0;
             }
@@ -347,7 +347,7 @@ int convert_trans_affine(PyObject *obj, void *transp)
             return 1;
         }
     }
-    catch (py::exception)
+    catch (py::exception &)
     {
         return 0;
     }
diff --git a/src/py_exceptions.h b/src/py_exceptions.h
@@ -30,7 +30,7 @@ class exception : public std::exception
         }                                                                    \
         return (errorcode);                                                  \
     }                                                                        \
-    catch (const std::bad_alloc)                                             \
+    catch (const std::bad_alloc &)                                           \
     {                                                                        \
         PyErr_Format(PyExc_MemoryError, "In %s: Out of memory", (name));     \
         {                                                                    \

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ int convert_rect(PyObject rectobj, void rectp)`
`167`	`167`	`rect->x2 = rect_arr(1, 0);`
`168`	`168`	`rect->y2 = rect_arr(1, 1);`
`169`	`169`	`}`
`170`		`- catch (py::exception)`
	`170`	`+ catch (py::exception &)`
`171`	`171`	`{`
`172`	`172`	`PyErr_Clear();`
`173`	`173`
`@@ -185,7 +185,7 @@ int convert_rect(PyObject rectobj, void rectp)`
`185`	`185`	`rect->x2 = rect_arr(2);`
`186`	`186`	`rect->y2 = rect_arr(3);`
`187`	`187`	`}`
`188`		`- catch (py::exception)`
	`188`	`+ catch (py::exception &)`
`189`	`189`	`{`
`190`	`190`	`return 0;`
`191`	`191`	`}`
`@@ -347,7 +347,7 @@ int convert_trans_affine(PyObject obj, void transp)`
`347`	`347`	`return 1;`
`348`	`348`	`}`
`349`	`349`	`}`
`350`		`- catch (py::exception)`
	`350`	`+ catch (py::exception &)`
`351`	`351`	`{`
`352`	`352`	`return 0;`
`353`	`353`	`}`