Skip to content

Commit db764bc

Browse files
committed
support building against 2.8 too
1 parent 01df1cb commit db764bc

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

src/pdal/plang/Environment.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@
5454
#define NPY_API_SYMBOL_ATTRIBUTE
5555
#define NPY_NO_DEPRECATED_API NPY_1_22_API_VERSION
5656

57-
// PDAL renamed this but it is not aliased on windows for PDAL 2.9
58-
# define PDAL_DLL PDAL_EXPORT
59-
6057
namespace pdal
6158
{
6259
namespace plang

src/pdal/plang/Invocation.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
#include <pdal/Dimension.hpp>
4343
#include <pdal/PointView.hpp>
4444

45-
// PDAL renamed this but it is not aliased on windows for PDAL 2.9
46-
# define PDAL_DLL PDAL_EXPORT
47-
4845
namespace pdal
4946
{
5047
namespace plang

src/pdal/plang/Script.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@
3838

3939
#include <pdal/Options.hpp>
4040

41+
#ifndef PDAL_DLL
4142
// PDAL renamed this but it is not aliased on windows for PDAL 2.9
4243
# define PDAL_DLL PDAL_EXPORT
44+
#endif
4345

4446
namespace pdal
4547
{

src/pdal/test/PythonFilterTest.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,10 +552,12 @@ TEST_F(PredicateFilterTest, PredicateFilterTest_test_programmable_4)
552552
PointViewPtr buf(new PointView(table));
553553

554554
filter->prepare(table);
555+
reader.prepare(table);
556+
PointViewSet viewSet = reader.execute(table);
555557

556-
StageWrapper::ready(reader, table);
557-
PointViewSet viewSet = StageWrapper::run(reader, buf);
558-
StageWrapper::done(reader, table);
558+
// StageWrapper::ready(reader, table);
559+
// PointViewSet viewSet = StageWrapper::run(reader, buf);
560+
// StageWrapper::done(reader, table);
559561
EXPECT_EQ(viewSet.size(), 1u);
560562
buf = *viewSet.begin();
561563
EXPECT_EQ(buf->size(), 1000u);

0 commit comments

Comments
 (0)