Rename #include guards without using reserved names.

QuLogic · QuLogic · commit 273e6113bbec · 2018-03-04T23:16:33.000-05:00
Anything (approximately) starting with two underscores, or an underscore
and a capital letter is reserved in the C++ standard.
diff --git a/lib/matplotlib/tri/_tri.h b/lib/matplotlib/tri/_tri.h
@@ -60,8 +60,8 @@
  * points below or above (including the same as) the contour level) and 6 that
  * do.  See the function get_exit_edge for details.
  */
-#ifndef _TRI_H
-#define _TRI_H
+#ifndef MPL_TRI_H
+#define MPL_TRI_H
 
 #include "src/numpy_cpp.h"
 
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -3,8 +3,8 @@
 /* _backend_agg.h
 */
 
-#ifndef __BACKEND_AGG_H__
-#define __BACKEND_AGG_H__
+#ifndef MPL_BACKEND_AGG_H
+#define MPL_BACKEND_AGG_H
 
 #include <cmath>
 #include <vector>
diff --git a/src/_backend_agg_basic_types.h b/src/_backend_agg_basic_types.h
@@ -1,5 +1,5 @@
-#ifndef __BACKEND_AGG_BASIC_TYPES_H__
-#define __BACKEND_AGG_BASIC_TYPES_H__
+#ifndef MPL_BACKEND_AGG_BASIC_TYPES_H
+#define MPL_BACKEND_AGG_BASIC_TYPES_H
 
 /* Contains some simple types from the Agg backend that are also used
    by other modules */
diff --git a/src/_contour.h b/src/_contour.h
@@ -139,8 +139,8 @@
  * different polygons.  The S-most polygon must be started first, then the next
  * S-most and so on until the N-most polygon is started in that quad.
  */
-#ifndef _CONTOUR_H
-#define _CONTOUR_H
+#ifndef MPL_CONTOUR_H
+#define MPL_CONTOUR_H
 
 #include "src/numpy_cpp.h"
 #include <stdint.h>
diff --git a/src/_image.h b/src/_image.h
@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef _IMAGE_H
-#define _IMAGE_H
+#ifndef MPL_IMAGE_H
+#define MPL_IMAGE_H
 
 #include <vector>
 
diff --git a/src/_image_resample.h b/src/_image_resample.h
@@ -1,7 +1,7 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
-#ifndef RESAMPLE_H
-#define RESAMPLE_H
+#ifndef MPL_RESAMPLE_H
+#define MPL_RESAMPLE_H
 
 #include "agg_image_accessors.h"
 #include "agg_path_storage.h"
@@ -1010,4 +1010,4 @@ void resample(
     }
 }
 
-#endif /* RESAMPLE_H */
+#endif /* MPL_RESAMPLE_H */
diff --git a/src/_path.h b/src/_path.h
@@ -1,7 +1,7 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
-#ifndef __PATH_H__
-#define __PATH_H__
+#ifndef MPL_PATH_H
+#define MPL_PATH_H
 
 #include <limits>
 #include <math.h>
diff --git a/src/agg_workaround.h b/src/agg_workaround.h
@@ -1,5 +1,5 @@
-#ifndef __AGG_WORKAROUND_H__
-#define __AGG_WORKAROUND_H__
+#ifndef MPL_AGG_WORKAROUND_H
+#define MPL_AGG_WORKAROUND_H
 
 #include "agg_pixfmt_rgba.h"
 
diff --git a/src/array.h b/src/array.h
@@ -3,8 +3,8 @@
 /* Utilities to create scalars and empty arrays that behave like the
    Numpy array wrappers in numpy_cpp.h */
 
-#ifndef _SCALAR_H_
-#define _SCALAR_H_
+#ifndef MPL_SCALAR_H
+#define MPL_SCALAR_H
 
 namespace array
 {
diff --git a/src/file_compat.h b/src/file_compat.h
@@ -1,5 +1,5 @@
-#ifndef __FILE_COMPAT_H__
-#define __FILE_COMPAT_H__
+#ifndef MPL_FILE_COMPAT_H
+#define MPL_FILE_COMPAT_H
 
 #include <Python.h>
 #include <stdio.h>
@@ -234,4 +234,4 @@ static NPY_INLINE int mpl_PyFile_CloseFile(PyObject *file)
 }
 #endif
 
-#endif /* ifndef __FILE_COMPAT_H__ */
+#endif /* ifndef MPL_FILE_COMPAT_H */
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -1,8 +1,8 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
 /* A python interface to FreeType */
-#ifndef _FT2FONT_H
-#define _FT2FONT_H
+#ifndef MPL_FT2FONT_H
+#define MPL_FT2FONT_H
 #include <vector>
 #include <stdint.h>
 
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -2,8 +2,8 @@
 
 /* Small utilities that are shared by most extension modules. */
 
-#ifndef _MPLUTILS_H
-#define _MPLUTILS_H
+#ifndef MPLUTILS_H
+#define MPLUTILS_H
 
 #if defined(_MSC_VER) && _MSC_VER <= 1600
 typedef unsigned __int8   uint8_t;
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -1,7 +1,7 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
-#ifndef _NUMPY_CPP_H_
-#define _NUMPY_CPP_H_
+#ifndef MPL_NUMPY_CPP_H
+#define MPL_NUMPY_CPP_H
 
 /***************************************************************************
  * This file is based on original work by Mark Wiebe, available at:
diff --git a/src/path_cleanup.h b/src/path_cleanup.h
@@ -1,7 +1,7 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
-#ifndef PATH_CLEANUP_H
-#define PATH_CLEANUP_H
+#ifndef MPL_PATH_CLEANUP_H
+#define MPL_PATH_CLEANUP_H
 
 #include <Python.h>
 
@@ -24,4 +24,4 @@ unsigned get_vertex(void *pipeline, double *x, double *y);
 
 void free_path_iterator(void *pipeline);
 
-#endif /* PATH_CLEANUP_H */
+#endif /* MPL_PATH_CLEANUP_H */
diff --git a/src/path_converters.h b/src/path_converters.h
@@ -1,7 +1,7 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
-#ifndef __PATH_CONVERTERS_H__
-#define __PATH_CONVERTERS_H__
+#ifndef MPL_PATH_CONVERTERS_H
+#define MPL_PATH_CONVERTERS_H
 
 #include <cmath>
 #include <stdint.h>
@@ -1008,4 +1008,4 @@ class Sketch
     RandomNumberGenerator m_rand;
 };
 
-#endif // __PATH_CONVERTERS_H__
+#endif // MPL_PATH_CONVERTERS_H
diff --git a/src/py_adaptors.h b/src/py_adaptors.h
@@ -1,7 +1,7 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
-#ifndef __PY_ADAPTORS_H__
-#define __PY_ADAPTORS_H__
+#ifndef MPL_PY_ADAPTORS_H
+#define MPL_PY_ADAPTORS_H
 
 /***************************************************************************
  * This module contains a number of C++ classes that adapt Python data
diff --git a/src/py_converters.h b/src/py_converters.h
@@ -1,7 +1,7 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
-#ifndef __PY_CONVERTERS_H__
-#define __PY_CONVERTERS_H__
+#ifndef MPL_PY_CONVERTERS_H
+#define MPL_PY_CONVERTERS_H
 
 /***************************************************************************
  * This module contains a number of conversion functions from Python types
diff --git a/src/py_exceptions.h b/src/py_exceptions.h
@@ -1,7 +1,7 @@
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
-#ifndef __PY_EXCEPTIONS_H__
-#define __PY_EXCEPTIONS_H__
+#ifndef MPL_PY_EXCEPTIONS_H
+#define MPL_PY_EXCEPTIONS_H
 
 #include <exception>
 #include <stdexcept>

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`*`
`5`	`5`	`*/`
`6`	`6`
`7`		`-#ifndef _IMAGE_H`
`8`		`-#define _IMAGE_H`
	`7`	`+#ifndef MPL_IMAGE_H`
	`8`	`+#define MPL_IMAGE_H`
`9`	`9`
`10`	`10`	`#include <vector>`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* -- mode: c++; c-basic-offset: 4 -- */`
`2`	`2`
`3`		`-#ifndef RESAMPLE_H`
`4`		`-#define RESAMPLE_H`
	`3`	`+#ifndef MPL_RESAMPLE_H`
	`4`	`+#define MPL_RESAMPLE_H`
`5`	`5`
`6`	`6`	`#include "agg_image_accessors.h"`
`7`	`7`	`#include "agg_path_storage.h"`
`@@ -1010,4 +1010,4 @@ void resample(`
`1010`	`1010`	`}`
`1011`	`1011`	`}`
`1012`	`1012`
`1013`		`-#endif /* RESAMPLE_H */`
	`1013`	`+#endif /* MPL_RESAMPLE_H */`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`/* Utilities to create scalars and empty arrays that behave like the`
`4`	`4`	`Numpy array wrappers in numpy_cpp.h */`
`5`	`5`
`6`		`-#ifndef _SCALAR_H_`
`7`		`-#define _SCALAR_H_`
	`6`	`+#ifndef MPL_SCALAR_H`
	`7`	`+#define MPL_SCALAR_H`
`8`	`8`
`9`	`9`	`namespace array`
`10`	`10`	`{`