Skip to content

Commit

Permalink
[FIX] workaround for gcc-4.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
h-2 committed Jan 10, 2017
1 parent 7775181 commit 486ba90
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions src/misc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,12 @@ _myReadRecordsImpl(TCDStringSet<String<char>> & meta,
template <typename TSpec1,
typename TSpec2,
typename TFile,
typename TRunnable = std::function<void(typename Value<TCDStringSet<String<char, TSpec1>>>::Type const &,
uint64_t const)> >
typename TRunnable>
inline int
myReadRecords(TCDStringSet<String<char, TSpec1>> & ids,
TCDStringSet<String<Dna5, TSpec2>> & seqs,
TFile & file,
TRunnable && runnable = [] (auto const &, uint64_t const) {})
TRunnable && runnable)
{
TCDStringSet<String<Iupac>> tmpSeqs; // all IUPAC nucleic acid characters are valid input
try
Expand All @@ -252,13 +251,12 @@ myReadRecords(TCDStringSet<String<char, TSpec1>> & ids,
template <typename TSpec1,
typename TSpec2,
typename TFile,
typename TRunnable = std::function<void(typename Value<TCDStringSet<String<char, TSpec1>>>::Type const &,
uint64_t const)> >
typename TRunnable>
inline int
myReadRecords(TCDStringSet<String<char, TSpec1>> & ids,
TCDStringSet<String<AminoAcid, TSpec2>> & seqs,
TFile & file,
TRunnable && runnable = [] (auto const &, uint64_t const) {})
TRunnable && runnable)
{
try
{
Expand All @@ -282,6 +280,18 @@ myReadRecords(TCDStringSet<String<char, TSpec1>> & ids,
return 0;
}

template <typename TSpec1,
typename TCharSpec,
typename TSpec2,
typename TFile>
inline int
myReadRecords(TCDStringSet<String<char, TSpec1>> & ids,
TCDStringSet<String<TCharSpec, TSpec2>> & seqs,
TFile & file)
{
return myReadRecords(ids, seqs, file, [] (auto const &, uint64_t const) {});
}

// ----------------------------------------------------------------------------
// truncate sequences
// ----------------------------------------------------------------------------
Expand Down

0 comments on commit 486ba90

Please sign in to comment.