Skip to content

Commit d6baa52

Browse files
authored
Fix header including to avoid confusion: header only included where they are needed (#940)
1 parent e39a44f commit d6baa52

File tree

10 files changed

+8
-33
lines changed

10 files changed

+8
-33
lines changed

CPP/Clipper2Lib/include/clipper2/clipper.core.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,14 @@
1010
#ifndef CLIPPER_CORE_H
1111
#define CLIPPER_CORE_H
1212

13+
#include "clipper2/clipper.version.h"
1314
#include <cstdint>
14-
#include <cstdlib>
15-
#include <cmath>
1615
#include <vector>
1716
#include <string>
1817
#include <iostream>
1918
#include <algorithm>
20-
#include <climits>
2119
#include <numeric>
22-
#include <optional>
23-
#include "clipper2/clipper.version.h"
20+
#include <cmath>
2421

2522
namespace Clipper2Lib
2623
{

CPP/Clipper2Lib/include/clipper2/clipper.engine.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,11 @@
1010
#ifndef CLIPPER_ENGINE_H
1111
#define CLIPPER_ENGINE_H
1212

13-
#include <cstdlib>
14-
#include <stdint.h> //#541
15-
#include <iostream>
13+
#include "clipper2/clipper.core.h"
1614
#include <queue>
17-
#include <vector>
1815
#include <functional>
19-
#include <numeric>
2016
#include <memory>
2117

22-
#include "clipper2/clipper.core.h"
23-
2418
namespace Clipper2Lib {
2519

2620
struct Scanline;

CPP/Clipper2Lib/include/clipper2/clipper.export.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,11 @@ the four vertices that define the two segments that are intersecting.
112112
#ifndef CLIPPER2_EXPORT_H
113113
#define CLIPPER2_EXPORT_H
114114

115-
#include <cstdlib>
116-
#include <vector>
117115
#include "clipper2/clipper.core.h"
118116
#include "clipper2/clipper.engine.h"
119117
#include "clipper2/clipper.offset.h"
120118
#include "clipper2/clipper.rectclip.h"
119+
#include <cstdlib>
121120

122121
namespace Clipper2Lib {
123122

CPP/Clipper2Lib/include/clipper2/clipper.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@
1010
#ifndef CLIPPER_H
1111
#define CLIPPER_H
1212

13-
#include <cstdlib>
14-
#include <type_traits>
15-
#include <vector>
16-
1713
#include "clipper2/clipper.core.h"
1814
#include "clipper2/clipper.engine.h"
1915
#include "clipper2/clipper.offset.h"
2016
#include "clipper2/clipper.minkowski.h"
2117
#include "clipper2/clipper.rectclip.h"
18+
#include <type_traits>
2219

2320
namespace Clipper2Lib {
2421

CPP/Clipper2Lib/include/clipper2/clipper.minkowski.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
#ifndef CLIPPER_MINKOWSKI_H
1111
#define CLIPPER_MINKOWSKI_H
1212

13-
#include <cstdlib>
14-
#include <vector>
15-
#include <string>
1613
#include "clipper2/clipper.core.h"
1714

1815
namespace Clipper2Lib

CPP/Clipper2Lib/include/clipper2/clipper.offset.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
#include "clipper.core.h"
1414
#include "clipper.engine.h"
15+
#include <optional>
1516

1617
namespace Clipper2Lib {
1718

CPP/Clipper2Lib/include/clipper2/clipper.rectclip.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
#ifndef CLIPPER_RECTCLIP_H
1111
#define CLIPPER_RECTCLIP_H
1212

13-
#include <cstdlib>
14-
#include <vector>
15-
#include <queue>
1613
#include "clipper2/clipper.core.h"
14+
#include <queue>
1715

1816
namespace Clipper2Lib
1917
{

CPP/Clipper2Lib/src/clipper.engine.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,9 @@
77
* License : https://www.boost.org/LICENSE_1_0.txt *
88
*******************************************************************************/
99

10-
#include <cstdlib>
11-
#include <cmath>
12-
#include <stdexcept>
13-
#include <vector>
14-
#include <numeric>
15-
#include <algorithm>
16-
1710
#include "clipper2/clipper.engine.h"
1811
#include "clipper2/clipper.h"
12+
#include <stdexcept>
1913

2014
// https://github.com/AngusJohnson/Clipper2/discussions/334
2115
// #discussioncomment-4248602

CPP/Clipper2Lib/src/clipper.offset.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* License : https://www.boost.org/LICENSE_1_0.txt *
88
*******************************************************************************/
99

10-
#include <cmath>
1110
#include "clipper2/clipper.h"
1211
#include "clipper2/clipper.offset.h"
1312

CPP/Clipper2Lib/src/clipper.rectclip.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* License : https://www.boost.org/LICENSE_1_0.txt *
88
*******************************************************************************/
99

10-
#include <cmath>
1110
#include "clipper2/clipper.h"
1211
#include "clipper2/clipper.rectclip.h"
1312

0 commit comments

Comments
 (0)