Skip to content

Commit ea6205e

Browse files
committed
boost: include bind.hpp where needed; Use single-redirect geometry header.
Include header needed to use boost::bind where missing Instead of `boost/geometry.hpp`, include `boost/geometry/geometry.hpp`. The reason is that boost/geometry.hpp is a header that just includes the boost/geometry/geometry.hpp header, which in turn is a header that includes a bunch of the actual implementation headers. The misc-include-cleaner complains about symbols it doesn't see, but that is because it is picky that it actualy wants the direct header that defines a thing. With redirecting headers, there is a way to add a `IWHY pragma: export` to tell that it forwards includes (and I'll send a pull request upstream to boost to make it happen), but that only works over one level. So we need to include the header that actually has all the forwarding includes (`"boost/geometry/geometry.hpp"`), not the header that forwards to the forwarding header (`"boost/geometry.hpp"`). Until I have sent a fix boost-upstream to add the IWYU pragmas, that won't do anything yet, but we're prepared. Signed-off-by: Henner Zeller <[email protected]>
1 parent 8796891 commit ea6205e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+50
-19
lines changed

src/Main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <string>
1919
#include <system_error>
2020

21-
#include "boost/stacktrace.hpp"
21+
#include "boost/stacktrace/stacktrace.hpp"
2222
#ifdef ENABLE_READLINE
2323
// If you get an error on this include be sure you have
2424
// the package tcl-tclreadline-devel installed

src/dft/src/architect/Opt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include <vector>
1313

1414
#include "ClockDomain.hh"
15-
#include "boost/geometry.hpp"
1615
#include "boost/geometry/geometries/register/point.hpp"
16+
#include "boost/geometry/geometry.hpp"
1717
#include "boost/geometry/index/rtree.hpp"
1818

1919
namespace bg = boost::geometry;

src/dpl/include/dpl/Opendp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <utility> // pair
1616
#include <vector>
1717

18-
#include "boost/geometry.hpp"
18+
#include "boost/geometry/geometry.hpp"
1919
#include "boost/geometry/index/rtree.hpp"
2020
#include "odb/db.h"
2121

src/drt/src/gc/FlexGC_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <utility>
1414
#include <vector>
1515

16-
#include "boost/geometry.hpp"
16+
#include "boost/geometry/geometry.hpp"
1717
#include "frProfileTask.h"
1818
#include "gc/FlexGC_impl.h"
1919

src/dst/src/Distributed.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "Worker.h"
1515
#include "boost/asio.hpp"
1616
#include "boost/asio/ip/tcp.hpp"
17+
#include "boost/bind/bind.hpp"
1718
#include "boost/system/system_error.hpp"
1819
#include "boost/thread/thread.hpp"
1920
#include "dst/JobCallBack.h"

src/dst/test/cpp/TestBalancer.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "HelperCallBack.h"
66
#include "LoadBalancer.h"
77
#include "boost/asio.hpp"
8+
#include "boost/bind/bind.hpp"
89
#include "boost/test/included/unit_test.hpp"
910
#include "boost/thread/thread.hpp"
1011
#include "dst/BroadcastJobDescription.h"

src/dst/test/cpp/TestDistributed.cc

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

66
#include "HelperCallBack.h"
77
#include "boost/asio.hpp"
8+
#include "boost/bind/bind.hpp"
89
#include "boost/test/included/unit_test.hpp"
910
#include "boost/thread/thread.hpp"
1011
#include "dst/Distributed.h"

src/dst/test/cpp/TestWorker.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "Worker.h"
77
#include "boost/asio.hpp"
88
#include "boost/asio/ip/tcp.hpp"
9+
#include "boost/bind/bind.hpp"
910
#include "boost/system/system_error.hpp"
1011
#include "boost/test/included/unit_test.hpp"
1112
#include "boost/thread/thread.hpp"

src/grt/src/RepairAntennas.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <vector>
1313

1414
#include "ant/AntennaChecker.hh"
15-
#include "boost/geometry.hpp"
15+
#include "boost/geometry/geometry.hpp"
1616
#include "boost/geometry/index/rtree.hpp"
1717
#include "boost/iterator/function_output_iterator.hpp"
1818
#include "dpl/Opendp.h"

src/gui/src/layoutViewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <utility>
3737
#include <vector>
3838

39-
#include "boost/geometry.hpp"
39+
#include "boost/geometry/geometry.hpp"
4040
#include "dbDescriptors.h"
4141
#include "gui/gui.h"
4242
#include "gui_utils.h"

0 commit comments

Comments
 (0)