From c1adc9403fc5b8a988fde60f84283566f476747c Mon Sep 17 00:00:00 2001 From: Benjamin Callahan Date: Sat, 11 Apr 2020 18:18:37 -0400 Subject: [PATCH] Fix Wreorder warning in finalSubsParallel --- DESCRIPTION | 2 +- src/Rmain.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index b029d48..ca2b9f0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,7 +8,7 @@ Description: The dada2 package infers exact amplicon sequence variants (ASVs) fr removing substitution and chimera errors. Taxonomic classification is available via a native implementation of the RDP naive Bayesian classifier, and species-level assignment to 16S rRNA gene fragments by exact matching. -Version: 1.15.4 +Version: 1.15.5 Date: 2020-04-07 Maintainer: Benjamin Callahan Author: Benjamin Callahan , Paul McMurdie, Susan Holmes diff --git a/src/Rmain.cpp b/src/Rmain.cpp index 03e76cc..c9386fc 100755 --- a/src/Rmain.cpp +++ b/src/Rmain.cpp @@ -194,7 +194,7 @@ Rcpp::List dada_uniques(std::vector< std::string > seqs, std::vector abunda int match, int mismatch, int gap, int homo_gap, bool use_kmers, int band_size, bool vectorized_alignment, int SSE, bool gapless) : b(b), subs(subs), birth_subs(birth_subs), match(match), mismatch(mismatch), gap(gap), homo_gap(homo_gap), - use_kmers(use_kmers), band_size(band_size), vectorized_alignment(vectorized_alignment), SSE(SSE), gapless(gapless) {} + band_size(band_size), use_kmers(use_kmers), vectorized_alignment(vectorized_alignment), SSE(SSE), gapless(gapless) {} // Perform sequence comparison void operator()(std::size_t begin, std::size_t end) { @@ -215,7 +215,7 @@ Rcpp::List dada_uniques(std::vector< std::string > seqs, std::vector abunda }; if(multithread) { - FinalSubsParallel finalSubsParallel(bb, subs, birth_subs, match, mismatch, gap, homo_gap, use_kmers, band_size, vectorized_alignment, SSE, gapless); + FinalSubsParallel finalSubsParallel(bb, subs, birth_subs, match, mismatch, gap, homo_gap, band_size, use_kmers, vectorized_alignment, SSE, gapless); RcppParallel::parallelFor(0, bb->nclust, finalSubsParallel, GRAIN_SIZE); } else { // Non-Parallel implementation for(i=0;inclust;i++) {