X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fapi%2Finternal%2FBamMultiMerger_p.h;h=3000097dd972e66456fb9eb7fffe668c9afbf054;hb=9f1ce8c47aeadb6dc1320b52ee671c3341b97935;hp=bd596efc44634c7185726e4eee77b5f701a8cdf5;hpb=daf64972794dbbdae4bea6a0495578708c86363b;p=bamtools.git diff --git a/src/api/internal/BamMultiMerger_p.h b/src/api/internal/BamMultiMerger_p.h index bd596ef..3000097 100644 --- a/src/api/internal/BamMultiMerger_p.h +++ b/src/api/internal/BamMultiMerger_p.h @@ -1,8 +1,8 @@ // *************************************************************************** // BamMultiMerger_p.h (c) 2010 Derek Barnett // Marth Lab, Department of Biology, Boston College -// All rights reserved. // --------------------------------------------------------------------------- +// Last modified: 10 October 2011 (DB) // --------------------------------------------------------------------------- // Provides merging functionality for BamMultiReader. At this point, supports // sorting results by (refId, position) or by read name. @@ -21,9 +21,9 @@ // // We mean it. -#include -#include -#include +#include "api/BamAlignment.h" +#include "api/BamReader.h" +#include "api/algorithms/Sort.h" #include #include #include @@ -121,6 +121,10 @@ class MultiMerger : public IMultiMerger { template inline void MultiMerger::Add(MergeItem item) { + + // N.B. - any future custom Compare types must define this method + // see algorithms/Sort.h + if ( CompareType::UsesCharData() ) item.Alignment->BuildCharData(); m_data.insert(item);