Skip to content

Commit 39a3d67

Browse files
authored
fix: Avoid compiler warning related to Rboolean (#594)
* fix: Avoid compiler warning related to `Rboolean` * Don't use xz if not available
1 parent 691102f commit 39a3d67

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

cleanup

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
set -ex
44

5-
git clean -fdx src
6-
cd src
7-
tar cvJf duckdb.tar.xz duckdb
8-
rm -rf duckdb
5+
# For CI/CD: only compress if expansion is possible too
6+
if which xz > /dev/null; then
7+
git clean -fdx src
8+
cd src
9+
tar cvJf duckdb.tar.xz duckdb
10+
rm -rf duckdb
11+
fi

cleanup.win

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
set -ex
44

5-
git clean -fdx src
6-
cd src
7-
find duckdb -type f | egrep '[.](cc|cpp|h|hpp)$' | xargs dos2unix
8-
tar cvJf duckdb.tar.xz duckdb
9-
rm -rf duckdb
5+
# For CI/CD: only compress if expansion is possible too
6+
if which xz > /dev/null; then
7+
git clean -fdx src
8+
cd src
9+
find duckdb -type f | egrep '[.](cc|cpp|h|hpp)$' | xargs dos2unix
10+
tar cvJf duckdb.tar.xz duckdb
11+
rm -rf duckdb
12+
fi

src/reltoaltrep.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Rboolean RelToAltrep::RownamesInspect(SEXP x, int pre, int deep, int pvec,
206206
AltrepRownamesWrapper::Get(x); // make sure this is alive
207207
Rprintf("DUCKDB_ALTREP_REL_ROWNAMES\n");
208208
return TRUE;
209-
END_CPP11_EX(FALSE)
209+
END_CPP11_EX(Rboolean::FALSE)
210210
}
211211

212212
Rboolean RelToAltrep::RelInspect(SEXP x, int pre, int deep, int pvec, void (*inspect_subtree)(SEXP, int, int, int)) {
@@ -215,7 +215,7 @@ Rboolean RelToAltrep::RelInspect(SEXP x, int pre, int deep, int pvec, void (*ins
215215
auto &col = wrapper->rel->rel->Columns()[wrapper->column_index];
216216
Rprintf("DUCKDB_ALTREP_REL_VECTOR %s (%s)\n", col.Name().c_str(), col.Type().ToString().c_str());
217217
return TRUE;
218-
END_CPP11_EX(FALSE)
218+
END_CPP11_EX(Rboolean::FALSE)
219219
}
220220

221221
// this allows us to set row names on a data frame with an int argument without calling INTPTR on it

0 commit comments

Comments
 (0)