From: Derek Date: Thu, 16 Sep 2010 05:52:26 +0000 (-0400) Subject: On second thought, moved the (non-indexing) constants back to BamAux.h, since they... X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7124011e66fb0345c57b6f6046527049fda9f461;p=bamtools.git On second thought, moved the (non-indexing) constants back to BamAux.h, since they are not technically specific to BamWriter only and clients may be using them in their code --- diff --git a/src/api/BamAux.h b/src/api/BamAux.h index daad5a0..84223a6 100644 --- a/src/api/BamAux.h +++ b/src/api/BamAux.h @@ -46,9 +46,17 @@ namespace BamTools { // BAM constants +const int BAM_CMATCH = 0; +const int BAM_CINS = 1; +const int BAM_CDEL = 2; +const int BAM_CREF_SKIP = 3; +const int BAM_CSOFT_CLIP = 4; +const int BAM_CHARD_CLIP = 5; +const int BAM_CPAD = 6; const int BAM_CIGAR_SHIFT = 4; const int BAM_CIGAR_MASK = ((1 << BAM_CIGAR_SHIFT) - 1); const int BAM_CORE_SIZE = 32; +const int BT_SIZEOF_INT = 4; struct CigarOp; diff --git a/src/api/BamWriter.cpp b/src/api/BamWriter.cpp index c3c94ef..f5eeb20 100644 --- a/src/api/BamWriter.cpp +++ b/src/api/BamWriter.cpp @@ -18,20 +18,6 @@ using namespace BamTools; using namespace std; -namespace BamTools { - -// BAM constants -const int BT_SIZEOF_INT = 4; -const int BAM_CMATCH = 0; -const int BAM_CINS = 1; -const int BAM_CDEL = 2; -const int BAM_CREF_SKIP = 3; -const int BAM_CSOFT_CLIP = 4; -const int BAM_CHARD_CLIP = 5; -const int BAM_CPAD = 6; - -} // namespace BamTools - struct BamWriter::BamWriterPrivate { // data members