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

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

diff --git a/src/api/internal/BamHeader_p.h b/src/api/internal/BamHeader_p.h
index 3738c6066177cec90924394052084aeb5886c27e..499ad96deaa15571c5235d946ecf2fe20bb8ad6d 100644 (file)
--- a/src/api/internal/BamHeader_p.h
+++ b/src/api/internal/BamHeader_p.h
@@ -2,7 +2,7 @@
 // BamHeader_p.h (c) 2010 Derek Barnett
 // Marth Lab, Department of Biology, Boston College
 // ---------------------------------------------------------------------------
-// Last modified: 26 January 2011 (DB)
+// Last modified: 10 October 2011 (DB)
 // ---------------------------------------------------------------------------
 // Provides the basic functionality for handling BAM headers.
 // ***************************************************************************
@@ -20,7 +20,7 @@
 //
 // We mean it.
 
-#include <api/SamHeader.h>
+#include "api/SamHeader.h"
 #include <string>
 
 namespace BamTools {
@@ -43,7 +43,7 @@ class BamHeader {
         bool IsValid(void) const;
         // load BAM header ('magic number' and SAM header text) from BGZF stream
         // returns true if all OK
-        bool Load(BgzfStream* stream);
+        void Load(BgzfStream* stream);
         // returns (editable) copy of SamHeader data object
         SamHeader ToSamHeader(void) const;
         // returns SAM-formatted string of header data
@@ -51,14 +51,12 @@ class BamHeader {
 
     // internal methods
     private:
-        // reads magic number from BGZF stream, returns true if valid
-        bool CheckMagicNumber(BgzfStream* stream);
+        // reads magic number from BGZF stream
+        void CheckMagicNumber(BgzfStream* stream);
         // reads SAM header length from BGZF stream, stores it in @length
-        // returns read success/fail status
-        bool ReadHeaderLength(BgzfStream* stream, uint32_t& length);
+        void ReadHeaderLength(BgzfStream* stream, uint32_t& length);
         // reads SAM header text from BGZF stream, stores in SamHeader object
-        // returns read success/fail status
-        bool ReadHeaderText(BgzfStream* stream, const uint32_t& length);
+        void ReadHeaderText(BgzfStream* stream, const uint32_t& length);
 
     // data members
     private: