Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix header including to avoid confusion: headers only included where they are needed #940

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions CPP/Clipper2Lib/include/clipper2/clipper.core.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@
#ifndef CLIPPER_CORE_H
#define CLIPPER_CORE_H

#include "clipper2/clipper.version.h"
#include <cstdint>
#include <cstdlib>
#include <cmath>
#include <vector>
#include <string>
#include <iostream>
#include <algorithm>
#include <climits>
#include <numeric>
#include <optional>
#include "clipper2/clipper.version.h"
#include <cmath>

namespace Clipper2Lib
{
Expand Down
8 changes: 1 addition & 7 deletions CPP/Clipper2Lib/include/clipper2/clipper.engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,11 @@
#ifndef CLIPPER_ENGINE_H
#define CLIPPER_ENGINE_H

#include <cstdlib>
#include <stdint.h> //#541
#include <iostream>
#include "clipper2/clipper.core.h"
#include <queue>
#include <vector>
#include <functional>
#include <numeric>
#include <memory>

#include "clipper2/clipper.core.h"

namespace Clipper2Lib {

struct Scanline;
Expand Down
3 changes: 1 addition & 2 deletions CPP/Clipper2Lib/include/clipper2/clipper.export.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,11 @@ the four vertices that define the two segments that are intersecting.
#ifndef CLIPPER2_EXPORT_H
#define CLIPPER2_EXPORT_H

#include <cstdlib>
#include <vector>
#include "clipper2/clipper.core.h"
#include "clipper2/clipper.engine.h"
#include "clipper2/clipper.offset.h"
#include "clipper2/clipper.rectclip.h"
#include <cstdlib>

namespace Clipper2Lib {

Expand Down
5 changes: 1 addition & 4 deletions CPP/Clipper2Lib/include/clipper2/clipper.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@
#ifndef CLIPPER_H
#define CLIPPER_H

#include <cstdlib>
#include <type_traits>
#include <vector>

#include "clipper2/clipper.core.h"
#include "clipper2/clipper.engine.h"
#include "clipper2/clipper.offset.h"
#include "clipper2/clipper.minkowski.h"
#include "clipper2/clipper.rectclip.h"
#include <type_traits>

namespace Clipper2Lib {

Expand Down
3 changes: 0 additions & 3 deletions CPP/Clipper2Lib/include/clipper2/clipper.minkowski.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
#ifndef CLIPPER_MINKOWSKI_H
#define CLIPPER_MINKOWSKI_H

#include <cstdlib>
#include <vector>
#include <string>
#include "clipper2/clipper.core.h"

namespace Clipper2Lib
Expand Down
1 change: 1 addition & 0 deletions CPP/Clipper2Lib/include/clipper2/clipper.offset.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include "clipper.core.h"
#include "clipper.engine.h"
#include <optional>

namespace Clipper2Lib {

Expand Down
4 changes: 1 addition & 3 deletions CPP/Clipper2Lib/include/clipper2/clipper.rectclip.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
#ifndef CLIPPER_RECTCLIP_H
#define CLIPPER_RECTCLIP_H

#include <cstdlib>
#include <vector>
#include <queue>
#include "clipper2/clipper.core.h"
#include <queue>

namespace Clipper2Lib
{
Expand Down
8 changes: 1 addition & 7 deletions CPP/Clipper2Lib/src/clipper.engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@
* License : https://www.boost.org/LICENSE_1_0.txt *
*******************************************************************************/

#include <cstdlib>
#include <cmath>
#include <stdexcept>
#include <vector>
#include <numeric>
#include <algorithm>

#include "clipper2/clipper.engine.h"
#include "clipper2/clipper.h"
#include <stdexcept>

// https://github.com/AngusJohnson/Clipper2/discussions/334
// #discussioncomment-4248602
Expand Down
1 change: 0 additions & 1 deletion CPP/Clipper2Lib/src/clipper.offset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
* License : https://www.boost.org/LICENSE_1_0.txt *
*******************************************************************************/

#include <cmath>
#include "clipper2/clipper.h"
#include "clipper2/clipper.offset.h"

Expand Down
1 change: 0 additions & 1 deletion CPP/Clipper2Lib/src/clipper.rectclip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
* License : https://www.boost.org/LICENSE_1_0.txt *
*******************************************************************************/

#include <cmath>
#include "clipper2/clipper.h"
#include "clipper2/clipper.rectclip.h"

Expand Down
Loading