Skip to content

Commit 92d39c6

Browse files
committed
Using DNDEBUG to remove asserts #5
1 parent 46ff771 commit 92d39c6

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ git clone https://github.com/HighlanderLab/tskitr.git
8383

8484
If you plan to update `tskit`, follow instructions in `extern/README.md`.
8585

86-
Then open `tskitr` package directory in your favourite R IDE (Positron, RStudio, text-editor-of-your-choice, etc.), implement your changes and run:
86+
Then open `tskitr` package directory in your favourite R IDE (Positron, RStudio, text-editor-of-your-choice, etc.), implement your changes and run (in R):
8787

8888
```
8989
# Note that the tskitr package is in the tskitr sub-directory

tskitr/src/Makevars.in

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ OBJECTS = $(TSKIT_OBJECTS) $(TSKITR_OBJECTS)
3030
PKG_CPPFLAGS = -I../inst/include -I../inst/include/tskit -I../inst/include/tskit/tskit
3131

3232
# Compiler flags
33-
# TODO: Remove asserts as per Writting R extensions manual #5
34-
# https://github.com/HighlanderLab/tskitr/issues/5
35-
# Note clang++ uses -DNDEBUG by default (see below output from devtools::install()) #5
36-
# clang++ -arch arm64 -std=gnu++17 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I../inst/include -I../inst/include/tskit -I../inst/include/tskit/tskit -I/opt/homebrew/opt/gettext/include -I'/Users/ggorjanc/Library/R/arm64/4.5/library/Rcpp/include' -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c tskitr.cpp -o tskitr.o
37-
# PKG_CFLAGS = -DNDEBUG
33+
PKG_CFLAGS = -DNDEBUG # to remove calls to assert()
3834
# TODO: Should we port any flags from extern/tskit/c/meson.build to R build system? #6
3935
# https://github.com/HighlanderLab/tskitr/issues/6
4036
# See default flags used by clang (see below output from devtools::install())

0 commit comments

Comments
 (0)