Cleaned up intra-API includes & moved version numbers to 2.0.0

[bamtools.git] / src / api / internal / BamMultiMerger_p.h

diff --git a/src/api/internal/BamMultiMerger_p.h b/src/api/internal/BamMultiMerger_p.h
index bd596efc44634c7185726e4eee77b5f701a8cdf5..3000097dd972e66456fb9eb7fffe668c9afbf054 100644 (file)
--- 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 <api/BamAlignment.h>
-#include <api/BamReader.h>
-#include <api/algorithms/Sort.h>
+#include "api/BamAlignment.h"
+#include "api/BamReader.h"
+#include "api/algorithms/Sort.h"
 #include <deque>
 #include <functional>
 #include <set>
@@ -121,6 +121,10 @@ class MultiMerger : public IMultiMerger {
 
 template <typename Compare>
 inline void MultiMerger<Compare>::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);