merge conflict

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

diff --git a/src/api/internal/BamMultiReader_p.h b/src/api/internal/BamMultiReader_p.h
index 70640a3fede57e9e3fa9656a21b4cfa83d9e47ef..4c4e5ea3ba382d2186857449bf8dc1847a3f60ce 100644 (file)
--- a/src/api/internal/BamMultiReader_p.h
+++ b/src/api/internal/BamMultiReader_p.h
@@ -31,6 +31,10 @@ namespace Internal {
 
 class BamMultiReaderPrivate {
 
+    // typedefs
+    public:
+        typedef std::pair<BamReader*, BamAlignment*> ReaderAlignment;
+
     // constructor / destructor
     public:
         BamMultiReaderPrivate(void);
@@ -71,6 +75,7 @@ class BamMultiReaderPrivate {
 
     // 'internal' methods
     public:
+
         IMultiMerger* CreateAlignmentCache(void) const;
         bool PopNextCachedAlignment(BamAlignment& al, const bool needCharData);
         bool RewindReaders(void);