Merge pull request #612 from SebKrantz/development

Development
SebKrantz · Jul 19, 2024 · 680aebb · 680aebb
2 parents 1b852bb + 7f20410
commit 680aebb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/R/join.R b/R/join.R
@@ -155,7 +155,7 @@ join <- function(x, y,
   }
 
   # Check for duplicate columns and suffix as needed
-  if(any(nm <- match(ynam[-iyon], xnam, nomatch = 0L))) {
+  if(any(nm <- match(ynam[-iyon], xnam, nomatch = 0L)) && switch(how, semi = FALSE, anti = FALSE, TRUE)) {
     nnm <- nm != 0L
     nam <- xnam[nm[nnm]]
     if(is.character(drop.dup.cols) || drop.dup.cols) {

diff --git a/README.md b/README.md
@@ -2,11 +2,11 @@
 
 <!-- badges: start -->
 [![R-CMD-check](https://github.com/SebKrantz/collapse/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/SebKrantz/collapse/actions/workflows/R-CMD-check.yaml)
-[![collapse status badge](https://fastverse.r-universe.dev/badges/collapse)](https://fastverse.r-universe.dev)
+[![collapse status badge](https://fastverse.r-universe.dev/badges/collapse)](https://fastverse.r-universe.dev/collapse)
 [![CRAN status](https://www.r-pkg.org/badges/version/collapse)](https://cran.r-project.org/package=collapse) 
 [![cran checks](https://badges.cranchecks.info/worst/collapse.svg)](https://cran.r-project.org/web/checks/check_results_collapse.html)
-![downloads per month](http://cranlogs.r-pkg.org/badges/collapse?color=blue)
-![downloads](http://cranlogs.r-pkg.org/badges/grand-total/collapse?color=blue)
+![downloads per month](http://cranlogs.r-pkg.org/badges/collapse) <!-- ?color=blue -->
+![downloads](http://cranlogs.r-pkg.org/badges/grand-total/collapse) <!-- ?color=blue -->
  [![Conda Version](https://img.shields.io/conda/vn/conda-forge/r-collapse.svg)](https://anaconda.org/conda-forge/r-collapse)
  [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/r-collapse.svg)](https://anaconda.org/conda-forge/r-collapse)
 [![Codecov test coverage](https://codecov.io/gh/SebKrantz/collapse/branch/master/graph/badge.svg)](https://app.codecov.io/gh/SebKrantz/collapse?branch=master)

diff --git a/src/base_radixsort.h b/src/base_radixsort.h
@@ -32,6 +32,7 @@
 
 #define NAMED_BITS 16
 
+#ifndef DEFN_H
 struct sxpinfo_struct {
   SEXPTYPE type      :  TYPE_BITS;
   /* ==> (FUNSXP == 99) %% 2^5 == 3 == CLOSXP
@@ -66,6 +67,7 @@ typedef struct VECTOR_SEXPREC {
   SEXPREC_HEADER;
   struct vecsxp_struct vecsxp;
 } VECTOR_SEXPREC, *VECSEXP;
+#endif
 
 typedef struct {
   SEXPREC_HEADER;