Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc fixes #1406

Merged
merged 2 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ext/src/hmmer/src/p7_pipeline.c
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,9 @@ p7_Pipeline(P7_PIPELINE *pli, P7_OPROFILE *om, P7_BG *bg, const ESL_SQ *sq, cons
int status;

if (sq->n == 0) return eslOK; /* silently skip length 0 seqs; they'd cause us all sorts of weird problems */
#if 0 // SPADES_LOCAL: disable
if (sq->n > 100000) ESL_EXCEPTION(eslETYPE, "Target sequence length > 100K, over comparison pipeline limit.\n(Did you mean to use nhmmer/nhmmscan?)");
#endif

p7_omx_GrowTo(pli->oxf, om->M, 0, sq->n); /* expand the one-row omx if needed */

Expand Down
2 changes: 1 addition & 1 deletion ext/src/lexy/include/lexy/input_location.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class input_location
{
if (lhs._line_nr != rhs._line_nr)
return lhs._line_nr < rhs._line_nr;
return lhs._column_nr < rhs._colum_nr;
return lhs._column_nr < rhs._column_nr;
}
friend constexpr bool operator<=(const input_location& lhs, const input_location& rhs)
{
Expand Down
2 changes: 1 addition & 1 deletion src/common/adt/flat_map.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ struct flat_map {
}

void swap(flat_map &other) {
data_.swap(other.data);
data_.swap(other.data_);
}

void clear() {
Expand Down
2 changes: 1 addition & 1 deletion src/common/adt/flat_set.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ struct flat_set {
return data_.erase(iterator_const_cast(first), iterator_const_cast(last));
}

void swap(flat_set &other) { data_.swap(other.data); }
void swap(flat_set &other) { data_.swap(other.data_); }

void clear() { data_.clear(); }

Expand Down
2 changes: 1 addition & 1 deletion src/common/kmer_index/ph_map/key_with_hash.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class SimpleKeyWithHash {
bool operator==(const SimpleKeyWithHash &that) const {
VERIFY_DEV(&this->hash_ == &that.hash_);
if (this->ready_ && that.ready_)
return this->idx_ == that.idx_ && this->is_minimal_ == that.is_minimal_;
return this->idx_ == that.idx_;
return this->key_ == that.key_;
}

Expand Down