From 61a63f95d9a62078ada7d4f83f25cc2a6d6619b4 Mon Sep 17 00:00:00 2001
From: arq5x <arq5x@virginia.edu>
Date: Sat, 1 Feb 2014 19:36:23 -0500
Subject: [PATCH] fix conflict.
---
src/utils/FileRecordTools/RecordOutputMgr.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/utils/FileRecordTools/RecordOutputMgr.cpp b/src/utils/FileRecordTools/RecordOutputMgr.cpp
index b24522eb..29148a28 100644
--- a/src/utils/FileRecordTools/RecordOutputMgr.cpp
+++ b/src/utils/FileRecordTools/RecordOutputMgr.cpp
@@ -140,6 +140,7 @@ void RecordOutputMgr::printRecord(RecordKeyList &keyList) {
return;
}
printRecord(keyList, NULL);
+
}
void RecordOutputMgr::printRecord(RecordKeyList &keyList, RecordKeyList *blockList)
@@ -208,7 +209,7 @@ void RecordOutputMgr::printRecord(RecordKeyList &keyList, RecordKeyList *blockLi
if (!printKeyAndTerminate(keyList)) {
tab();
}
- _currBlockList = NULL;
+ _currBamBlockList = NULL;
return;
}
}
@@ -433,4 +434,4 @@ void RecordOutputMgr::printKey(const Record *key)
void RecordOutputMgr::flush() {
fwrite(_outBuf.c_str(), 1, _outBuf.size(), stdout);
_outBuf.clear();
-}
+}
\ No newline at end of file
--
GitLab