Skip to content

Commit 6a88946

Browse files
committed
Remove references to JsonFwd.
1 parent db99caf commit 6a88946

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

io/private/ept/Addon.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
#include <list>
3838
#include <string>
3939

40-
#include <pdal/JsonFwd.hpp>
40+
#include <nlohmann/json.hpp>
41+
4142
#include <pdal/PointLayout.hpp>
4243

4344
#include "Overlap.hpp"

io/private/esri/EsriUtil.hpp

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

39-
#include <pdal/JsonFwd.hpp>
39+
#include <nlohmann/json.hpp>
4040

4141
namespace lepcc
4242
{

io/private/esri/Obb.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@
3434

3535
#pragma once
3636

37+
#include <nlohmann/json.hpp>
38+
3739
#include <Eigen/Geometry>
38-
#include <pdal/JsonFwd.hpp>
40+
3941
#include <pdal/util/Utils.hpp>
4042

4143
#include "EsriUtil.hpp"
@@ -76,7 +78,7 @@ class Obb
7678
Eigen::Vector3d m_p;
7779
double m_hx;
7880
double m_hy;
79-
double m_hz;
81+
double m_hz;
8082
Eigen::Quaterniond m_quat;
8183

8284
friend std::ostream& operator<<(std::ostream&, const Obb&);
@@ -112,4 +114,4 @@ inline StatusWithReason fromString(const std::string& from,
112114
}
113115

114116
} // namespace Utils
115-
} // namespace pdal
117+
} // namespace pdal

io/private/esri/PageManager.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
#include <mutex>
4040
#include <condition_variable>
4141

42-
#include <pdal/JsonFwd.hpp>
42+
#include <nlohmann/json.hpp>
43+
4344
#include <pdal/util/ThreadPool.hpp>
4445

4546
namespace pdal
@@ -79,4 +80,4 @@ class PageManager
7980
};
8081

8182
} //namespace i3s
82-
} // namespace pdal
83+
} // namespace pdal

io/private/stac/Catalog.hpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,13 @@
3434

3535
#pragma once
3636

37+
#include <nlohmann/json.hpp>
38+
3739
#include <pdal/PointView.hpp>
3840
#include <pdal/Stage.hpp>
3941
#include <pdal/util/ThreadPool.hpp>
4042
#include "../connector/Connector.hpp"
4143
#include "Item.hpp"
42-
#include <pdal/JsonFwd.hpp>
43-
44-
4544

4645
namespace pdal
4746
{
@@ -80,7 +79,6 @@ class Catalog
8079
virtual void validate();
8180

8281
protected:
83-
8482
const NL::json m_json;
8583
const std::string m_path;
8684
const connector::Connector& m_connector;
@@ -104,8 +102,7 @@ class Catalog
104102
void handleItem(const Item::Filters& f, NL::json readerArgs, std::string path);
105103
void handleCat(const Filters& f, NL::json readerArgs, std::string path);
106104
void handleCol(const Filters& f, NL::json readerArgs, std::string path);
107-
108105
};
109106

110-
}
111-
}
107+
} // namespace stac
108+
} // namespace pdal

pdal/private/gdal/GDALUtils.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
#pragma once
3636

37-
#include <pdal/JsonFwd.hpp>
3837
#include <pdal/SpatialReference.hpp>
3938
#include <pdal/util/Bounds.hpp>
4039

0 commit comments

Comments
 (0)