Remove semicolon after PyObject_HEAD. (matplotlib#8925)

anntzer · tacaswell · commit 062beb65ac5c · 2017-07-22T14:38:53.000-05:00
MNT: c++ cleanup See https://docs.python.org/3/extending/newtypes.html#the-basics: > Note that there is no semicolon after the PyObject_HEAD macro; one is included in the macro definition. Be wary of adding one by accident; it’s easy to do from habit, and your compiler might not complain, but someone else’s probably will! Also move a FT2Font *x; declaration to its own line (that was the original motivation).
diff --git a/lib/matplotlib/tri/_tri_wrapper.cpp b/lib/matplotlib/tri/_tri_wrapper.cpp
@@ -7,7 +7,7 @@
 
 typedef struct
 {
-    PyObject_HEAD;
+    PyObject_HEAD
     Triangulation* ptr;
 } PyTriangulation;
 
@@ -216,7 +216,7 @@ static PyTypeObject* PyTriangulation_init_type(PyObject* m, PyTypeObject* type)
 
 typedef struct
 {
-    PyObject_HEAD;
+    PyObject_HEAD
     TriContourGenerator* ptr;
     PyTriangulation* py_triangulation;
 } PyTriContourGenerator;
@@ -351,7 +351,7 @@ static PyTypeObject* PyTriContourGenerator_init_type(PyObject* m, PyTypeObject*
 
 typedef struct
 {
-    PyObject_HEAD;
+    PyObject_HEAD
     TrapezoidMapTriFinder* ptr;
     PyTriangulation* py_triangulation;
 } PyTrapezoidMapTriFinder;
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -4,7 +4,7 @@
 
 typedef struct
 {
-    PyObject_HEAD;
+    PyObject_HEAD
     RendererAgg *x;
     Py_ssize_t shape[3];
     Py_ssize_t strides[3];
@@ -13,7 +13,7 @@ typedef struct
 
 typedef struct
 {
-    PyObject_HEAD;
+    PyObject_HEAD
     BufferRegion *x;
     Py_ssize_t shape[3];
     Py_ssize_t strides[3];
diff --git a/src/_contour_wrapper.cpp b/src/_contour_wrapper.cpp
@@ -6,7 +6,7 @@
 
 typedef struct
 {
-    PyObject_HEAD;
+    PyObject_HEAD
     QuadContourGenerator* ptr;
 } PyQuadContourGenerator;
 
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -26,7 +26,7 @@
 
 typedef struct
 {
-    PyObject_HEAD;
+    PyObject_HEAD
     Tcl_Interp *interp;
 } TkappObject;
 
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -26,7 +26,7 @@ static PyObject *convert_xys_to_array(std::vector<double> &xys)
 
 typedef struct
 {
-    PyObject_HEAD;
+    PyObject_HEAD
     FT2Image *x;
     Py_ssize_t shape[2];
     Py_ssize_t strides[2];
@@ -229,7 +229,7 @@ static PyTypeObject *PyFT2Image_init_type(PyObject *m, PyTypeObject *type)
 
 typedef struct
 {
-    PyObject_HEAD;
+    PyObject_HEAD
     size_t glyphInd;
     long width;
     long height;
@@ -323,7 +323,8 @@ static PyTypeObject *PyGlyph_init_type(PyObject *m, PyTypeObject *type)
 
 typedef struct
 {
-    PyObject_HEAD FT2Font *x;
+    PyObject_HEAD
+    FT2Font *x;
     PyObject *fname;
     PyObject *py_file;
     FILE *fp;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`typedef struct`
`8`	`8`	`{`
`9`		`- PyObject_HEAD;`
	`9`	`+ PyObject_HEAD`
`10`	`10`	`QuadContourGenerator* ptr;`
`11`	`11`	`} PyQuadContourGenerator;`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`
`27`	`27`	`typedef struct`
`28`	`28`	`{`
`29`		`- PyObject_HEAD;`
	`29`	`+ PyObject_HEAD`
`30`	`30`	`Tcl_Interp *interp;`
`31`	`31`	`} TkappObject;`
`32`	`32`