diff --git a/include/gdstk/allocator.hpp b/include/gdstk/allocator.hpp index 58e5262c..7b659328 100644 --- a/include/gdstk/allocator.hpp +++ b/include/gdstk/allocator.hpp @@ -8,8 +8,6 @@ LICENSE file or #ifndef GDSTK_HEADER_ALLOCATOR #define GDSTK_HEADER_ALLOCATOR -#define __STDC_FORMAT_MACROS 1 - #include #include #include diff --git a/include/gdstk/array.hpp b/include/gdstk/array.hpp index 88d02296..9d28aff0 100644 --- a/include/gdstk/array.hpp +++ b/include/gdstk/array.hpp @@ -7,14 +7,12 @@ LICENSE file or #ifndef GDSTK_HEADER_ARRAY #define GDSTK_HEADER_ARRAY - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #define ARRAY_GROWTH_FACTOR 2 #define INITIAL_ARRAY_CAPACITY 4 -#include +#include #include #include #include diff --git a/include/gdstk/cell.hpp b/include/gdstk/cell.hpp index b6183526..0f5186b5 100644 --- a/include/gdstk/cell.hpp +++ b/include/gdstk/cell.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_CELL #define GDSTK_HEADER_CELL - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/clipper_tools.hpp b/include/gdstk/clipper_tools.hpp index 1b153275..25a77a67 100644 --- a/include/gdstk/clipper_tools.hpp +++ b/include/gdstk/clipper_tools.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_CLIPPER_TOOLS #define GDSTK_HEADER_CLIPPER_TOOLS - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/curve.hpp b/include/gdstk/curve.hpp index d437ddb6..c6674325 100644 --- a/include/gdstk/curve.hpp +++ b/include/gdstk/curve.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_CURVE #define GDSTK_HEADER_CURVE - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/flexpath.hpp b/include/gdstk/flexpath.hpp index 3fe2ebb1..ea37358a 100644 --- a/include/gdstk/flexpath.hpp +++ b/include/gdstk/flexpath.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_FLEXPATH #define GDSTK_HEADER_FLEXPATH - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/gdsii.hpp b/include/gdstk/gdsii.hpp index 609ef824..6b3ba5dc 100644 --- a/include/gdstk/gdsii.hpp +++ b/include/gdstk/gdsii.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_GDSII #define GDSTK_HEADER_GDSII - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/gdstk.hpp b/include/gdstk/gdstk.hpp index 68eb01bc..329187a4 100644 --- a/include/gdstk/gdstk.hpp +++ b/include/gdstk/gdstk.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_GDSTK #define GDSTK_HEADER_GDSTK - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #define GDSTK_VERSION "1.0.0" diff --git a/include/gdstk/gdswriter.hpp b/include/gdstk/gdswriter.hpp index 000c8872..ff0531c3 100644 --- a/include/gdstk/gdswriter.hpp +++ b/include/gdstk/gdswriter.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_GDSWRITER #define GDSTK_HEADER_GDSWRITER - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/label.hpp b/include/gdstk/label.hpp index 8019d782..1e5adc76 100644 --- a/include/gdstk/label.hpp +++ b/include/gdstk/label.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_LABEL #define GDSTK_HEADER_LABEL - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/layername.hpp b/include/gdstk/layername.hpp index 6fd5ade8..fda85b6b 100644 --- a/include/gdstk/layername.hpp +++ b/include/gdstk/layername.hpp @@ -6,8 +6,6 @@ LICENSE file or #ifndef GDSTK_HEADER_LAYERNAME #define GDSTK_HEADER_LAYERNAME - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/library.hpp b/include/gdstk/library.hpp index da54cd72..005c3b1f 100644 --- a/include/gdstk/library.hpp +++ b/include/gdstk/library.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_LIBRARY #define GDSTK_HEADER_LIBRARY - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/map.hpp b/include/gdstk/map.hpp index eadabcec..0f8aa60b 100644 --- a/include/gdstk/map.hpp +++ b/include/gdstk/map.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_MAP #define GDSTK_HEADER_MAP - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/oasis.hpp b/include/gdstk/oasis.hpp index 8cace5d7..57015bb3 100644 --- a/include/gdstk/oasis.hpp +++ b/include/gdstk/oasis.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_OASIS #define GDSTK_HEADER_OASIS - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/pathcommon.hpp b/include/gdstk/pathcommon.hpp index f1df51ce..d626cd6b 100644 --- a/include/gdstk/pathcommon.hpp +++ b/include/gdstk/pathcommon.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_PATHCOMMON #define GDSTK_HEADER_PATHCOMMON - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES namespace gdstk { diff --git a/include/gdstk/polygon.hpp b/include/gdstk/polygon.hpp index 4a44cd1a..00dd6ced 100644 --- a/include/gdstk/polygon.hpp +++ b/include/gdstk/polygon.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_POLYGON #define GDSTK_HEADER_POLYGON - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/property.hpp b/include/gdstk/property.hpp index b494f7c9..117c8c0d 100644 --- a/include/gdstk/property.hpp +++ b/include/gdstk/property.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_PROPERTY #define GDSTK_HEADER_PROPERTY - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/rawcell.hpp b/include/gdstk/rawcell.hpp index 4abf8398..4c3710f9 100644 --- a/include/gdstk/rawcell.hpp +++ b/include/gdstk/rawcell.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_RAWCELL #define GDSTK_HEADER_RAWCELL - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/reference.hpp b/include/gdstk/reference.hpp index 61d119eb..06d8a582 100644 --- a/include/gdstk/reference.hpp +++ b/include/gdstk/reference.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_REFERENCE #define GDSTK_HEADER_REFERENCE - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/repetition.hpp b/include/gdstk/repetition.hpp index 506c0713..60d7beaa 100644 --- a/include/gdstk/repetition.hpp +++ b/include/gdstk/repetition.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_REPETITION #define GDSTK_HEADER_REPETITION - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include "array.hpp" diff --git a/include/gdstk/robustpath.hpp b/include/gdstk/robustpath.hpp index 82d17f8b..e747afc5 100644 --- a/include/gdstk/robustpath.hpp +++ b/include/gdstk/robustpath.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_ROBUSTPATH #define GDSTK_HEADER_ROBUSTPATH - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/set.hpp b/include/gdstk/set.hpp index e6775be9..45da1a05 100644 --- a/include/gdstk/set.hpp +++ b/include/gdstk/set.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_SET #define GDSTK_HEADER_SET - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/sort.hpp b/include/gdstk/sort.hpp index 0b9fdf6b..fd51eb2b 100644 --- a/include/gdstk/sort.hpp +++ b/include/gdstk/sort.hpp @@ -7,11 +7,9 @@ LICENSE file or #ifndef GDSTK_HEADER_SORT #define GDSTK_HEADER_SORT - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES -#include +#include #include "array.hpp" diff --git a/include/gdstk/style.hpp b/include/gdstk/style.hpp index 85294d0f..deb6100d 100644 --- a/include/gdstk/style.hpp +++ b/include/gdstk/style.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_STYLE #define GDSTK_HEADER_STYLE - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/tagmap.hpp b/include/gdstk/tagmap.hpp index e583fe21..180ec49d 100644 --- a/include/gdstk/tagmap.hpp +++ b/include/gdstk/tagmap.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_TAGMAP #define GDSTK_HEADER_TAGMAP - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/include/gdstk/utils.hpp b/include/gdstk/utils.hpp index 14bf061e..c3b85efe 100644 --- a/include/gdstk/utils.hpp +++ b/include/gdstk/utils.hpp @@ -7,8 +7,6 @@ LICENSE file or #ifndef GDSTK_HEADER_UTILS #define GDSTK_HEADER_UTILS - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #define GDSTK_PRINT_BUFFER_COUNT 1024 diff --git a/include/gdstk/vec.hpp b/include/gdstk/vec.hpp index 91c6e0f0..6b8c6304 100644 --- a/include/gdstk/vec.hpp +++ b/include/gdstk/vec.hpp @@ -7,11 +7,9 @@ LICENSE file or #ifndef GDSTK_HEADER_VEC #define GDSTK_HEADER_VEC - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES -#include +#include #include namespace gdstk { diff --git a/src/cell.cpp b/src/cell.cpp index cc3ea294..7fc8d5ac 100644 --- a/src/cell.cpp +++ b/src/cell.cpp @@ -4,12 +4,10 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include -#include +#include #include #include #include diff --git a/src/clipper_tools.cpp b/src/clipper_tools.cpp index 0fe25e7b..e2e813da 100644 --- a/src/clipper_tools.cpp +++ b/src/clipper_tools.cpp @@ -4,8 +4,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/src/curve.cpp b/src/curve.cpp index e40b7599..cffa120f 100644 --- a/src/curve.cpp +++ b/src/curve.cpp @@ -4,11 +4,9 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES -#include +#include #include #include #include diff --git a/src/flexpath.cpp b/src/flexpath.cpp index 3cf4c13c..ef0fbc7d 100644 --- a/src/flexpath.cpp +++ b/src/flexpath.cpp @@ -4,11 +4,9 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES -#include +#include #include #include #include diff --git a/src/gdsii.cpp b/src/gdsii.cpp index 65bc4354..0b3b1ed5 100644 --- a/src/gdsii.cpp +++ b/src/gdsii.cpp @@ -4,8 +4,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/src/label.cpp b/src/label.cpp index 3f85fe24..8b2ead57 100644 --- a/src/label.cpp +++ b/src/label.cpp @@ -4,8 +4,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/src/layername.cpp b/src/layername.cpp index dca2de07..8a3240b7 100644 --- a/src/layername.cpp +++ b/src/layername.cpp @@ -3,8 +3,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/src/library.cpp b/src/library.cpp index f9a38faa..d92f005e 100644 --- a/src/library.cpp +++ b/src/library.cpp @@ -4,11 +4,9 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES -#include +#include #include #include #include diff --git a/src/oasis.cpp b/src/oasis.cpp index 2aaf5586..a0a6d502 100644 --- a/src/oasis.cpp +++ b/src/oasis.cpp @@ -4,8 +4,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/src/polygon.cpp b/src/polygon.cpp index 61870a51..93259963 100644 --- a/src/polygon.cpp +++ b/src/polygon.cpp @@ -4,12 +4,10 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include -#include +#include #include #include #include diff --git a/src/property.cpp b/src/property.cpp index a134d111..b3e9c5e5 100644 --- a/src/property.cpp +++ b/src/property.cpp @@ -4,8 +4,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/src/rawcell.cpp b/src/rawcell.cpp index c05c4250..bc100ca2 100644 --- a/src/rawcell.cpp +++ b/src/rawcell.cpp @@ -4,12 +4,10 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include -#include +#include #include #include diff --git a/src/reference.cpp b/src/reference.cpp index 8868c4c9..335013cb 100644 --- a/src/reference.cpp +++ b/src/reference.cpp @@ -4,8 +4,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/src/repetition.cpp b/src/repetition.cpp index 486e68c3..988e3bf6 100644 --- a/src/repetition.cpp +++ b/src/repetition.cpp @@ -4,8 +4,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/src/robustpath.cpp b/src/robustpath.cpp index 9aa61b69..9cbb5138 100644 --- a/src/robustpath.cpp +++ b/src/robustpath.cpp @@ -4,11 +4,9 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES -#include +#include #include #include #include diff --git a/src/style.cpp b/src/style.cpp index 33ee21ee..c5ad7135 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -4,8 +4,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include diff --git a/src/utils.cpp b/src/utils.cpp index 9d315908..839b4fe1 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -4,8 +4,6 @@ This file is part of gdstk, distributed under the terms of the Boost Software License - Version 1.0. See the accompanying LICENSE file or */ - -#define __STDC_FORMAT_MACROS 1 #define _USE_MATH_DEFINES #include