From: derek <derekwbarnett@gmail.com>
Date: Tue, 4 Oct 2011 04:39:40 +0000 (-0400)
Subject: Removed duplicated method that snuck past a prior merge conflict resolution
X-Git-Url: https://git.donarmstrong.com/?p=bamtools.git;a=commitdiff_plain;h=810613e2506b2dd8e16312f9f73346599943922c

Removed duplicated method that snuck past a prior merge conflict resolution
---

diff --git a/src/api/internal/BamMultiReader_p.cpp b/src/api/internal/BamMultiReader_p.cpp
index bacc449..292c287 100644
--- a/src/api/internal/BamMultiReader_p.cpp
+++ b/src/api/internal/BamMultiReader_p.cpp
@@ -480,33 +480,6 @@ bool BamMultiReaderPrivate::PopNextCachedAlignment(BamAlignment& al, const bool
     return true;
 }
 
-bool BamMultiReaderPrivate::PopNextCachedAlignment(BamAlignment& al, const bool needCharData) {
-
-    // bail out if no more data to process
-    if ( !HasAlignmentData() )
-        return false;
-
-    // pop next reader/alignment pair
-    ReaderAlignment nextReaderAlignment = m_alignments->TakeFirst();
-    BamReader*    reader    = nextReaderAlignment.first;
-    BamAlignment* alignment = nextReaderAlignment.second;
-
-    // store cached alignment into destination parameter (by copy)
-    al = *alignment;
-
-    // set char data if requested
-    if ( needCharData ) {
-        al.BuildCharData();
-        al.Filename = reader->GetFilename();
-    }
-
-    // load next alignment from reader & store in cache
-    SaveNextAlignment(reader, alignment);
-
-    // return success
-    return true;
-}
-
 // returns BAM file pointers to beginning of alignment data & resets alignment cache
 bool BamMultiReaderPrivate::Rewind(void) {