Skip to content

Commit

Permalink
fix warning on M1 mac
Browse files Browse the repository at this point in the history
  • Loading branch information
Zilong-Li committed Jan 14, 2024
1 parent fa1a721 commit 6b17ff0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: vcfppR
Title: Rapid Manipulation of the Variant Call Format (VCF)
Version: 0.3.7
Version: 0.3.8
Authors@R: c(
person("Zilong", "Li", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0001-5859-2078")),
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# vcfppR 0.3.8

* fix issues on M1 Mac

# vcfppR 0.3.7

* add `vcfreader@rmFormatTag()`
Expand Down
10 changes: 2 additions & 8 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
Fix the following issues.
Fix issues on M1 Mac

1. Removed the redundant "in R" in the title.
2. Wrote 'C++', 'htslib' 'vcfpp.h' in single quotes
3. Updated the .Rd files by adding \value and \examples for exported methods and classes
4. Added the authors of htslib as 'cph' in ‘Authors@R’
https://cran.r-project.org/web/checks/check_results_vcfppR.html

Comments about documenting the C++ class:

I've documented each method of the C++ class by using a nested structure inside the \section(Fields), which is the only way I found that can document the C++ class by doxygen2 automatically.
4 changes: 2 additions & 2 deletions src/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ CXX=$(shell "R CMD config CXX")
AR=$(shell "R CMD config AR")
RANLIB=$(shell "R CMD config RANLIB")
LDFLAGS=$(shell "R CMD config LDFLAGS")
# CFLAGS=$(shell "R CMD config CFLAGS")
# CPPFLAGS=$(shell "R CMD config CPPFLAGS")
CFLAGS=$(shell "R CMD config CFLAGS")
CPPFLAGS=$(shell "R CMD config CPPFLAGS")

HTSLIB:
(cd ${HTSLIB_DIR} && $(MAKE) -f Makefile.vcfppR libhts.a && cd ..)
Expand Down
2 changes: 1 addition & 1 deletion src/htslib-1.18/htscodecs/htscodecs/rANS_static4x16pr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ unsigned char *(*rans_dec_func(int do_simd, int order))
#include <processthreadsapi.h>
#endif

static inline int have_neon() {
static inline int have_neon(void) {
#if defined(__linux__) && defined(__arm__)
return (getauxval(AT_HWCAP) & HWCAP_NEON) != 0;
#elif defined(__linux__) && defined(__aarch64__)
Expand Down

0 comments on commit 6b17ff0

Please sign in to comment.