On second thought, moved the (non-indexing) constants back to BamAux.h, since they...

diff --git a/src/api/BamAux.h b/src/api/BamAux.h
index daad5a0a026e55cd7a0b377d66c488e9d9cf9165..84223a61654eb51eefadba790acb2d1310b97145 100644 (file)
--- a/src/api/BamAux.h
+++ b/src/api/BamAux.h
@@ -46,9 +46,17 @@
 namespace BamTools {\r
 \r
 // BAM constants\r
+const int BAM_CMATCH      = 0;\r
+const int BAM_CINS        = 1;\r
+const int BAM_CDEL        = 2;\r
+const int BAM_CREF_SKIP   = 3;\r
+const int BAM_CSOFT_CLIP  = 4;\r
+const int BAM_CHARD_CLIP  = 5;\r
+const int BAM_CPAD        = 6;\r
 const int BAM_CIGAR_SHIFT = 4;\r
 const int BAM_CIGAR_MASK  = ((1 << BAM_CIGAR_SHIFT) - 1);\r
 const int BAM_CORE_SIZE   = 32;\r
+const int BT_SIZEOF_INT   = 4;\r
 \r
 struct CigarOp;\r
 \r

diff --git a/src/api/BamWriter.cpp b/src/api/BamWriter.cpp
index c3c94efa1d99231f77bca2fb6075b35f522c4b01..f5eeb2013bdb0dd8f91e0fe5184207df849fb74c 100644 (file)
--- a/src/api/BamWriter.cpp
+++ b/src/api/BamWriter.cpp
@@ -18,20 +18,6 @@
 using namespace BamTools;\r
 using namespace std;\r
 \r
-namespace BamTools {\r
-\r
-// BAM constants\r
-const int BT_SIZEOF_INT   = 4;\r
-const int BAM_CMATCH      = 0;\r
-const int BAM_CINS        = 1;\r
-const int BAM_CDEL        = 2;\r
-const int BAM_CREF_SKIP   = 3;\r
-const int BAM_CSOFT_CLIP  = 4;\r
-const int BAM_CHARD_CLIP  = 5;\r
-const int BAM_CPAD        = 6;\r
-\r
-} // namespace BamTools\r
-\r
 struct BamWriter::BamWriterPrivate {\r
 \r
     // data members\r