X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fapi%2FBamConstants.h;h=47f73a9baf3161db336dbe0dc66343f3ef147cee;hb=c3a7c31347d42a926214e2508d713975d124e8c6;hp=7c115f1dfb96e08f3f1908d5125f56fcd643f57d;hpb=25a2a1f6598b6452455da96c28a7f58fd9e7ed2d;p=bamtools.git

diff --git a/src/api/BamConstants.h b/src/api/BamConstants.h
index 7c115f1..47f73a9 100644
--- a/src/api/BamConstants.h
+++ b/src/api/BamConstants.h
@@ -2,7 +2,7 @@
 // BamConstants.h (c) 2011 Derek Barnett
 // Marth Lab, Department of Biology, Boston College
 // ---------------------------------------------------------------------------
-// Last modified: 10 October 2011 (DB)
+// Last modified: 16 October 2011 (DB)
 // ---------------------------------------------------------------------------
 // Provides basic constants for handling BAM files.
 // ***************************************************************************
@@ -10,7 +10,7 @@
 #ifndef BAM_CONSTANTS_H
 #define BAM_CONSTANTS_H
 
-#include <api/api_global.h>
+#include "api/api_global.h"
 #include <cassert>
 #include <string>
 
@@ -71,12 +71,12 @@ const int BAM_CIGAR_MASK  = ((1 << BAM_CIGAR_SHIFT) - 1);
 
 // BAM tag types & sizes
 const char BAM_TAG_TYPE_ASCII  = 'A';
-const char BAM_TAG_TYPE_UINT8  = 'c';
-const char BAM_TAG_TYPE_INT8   = 'C';
-const char BAM_TAG_TYPE_UINT16 = 's';
-const char BAM_TAG_TYPE_INT16  = 'S';
-const char BAM_TAG_TYPE_UINT32 = 'i';
-const char BAM_TAG_TYPE_INT32  = 'I';
+const char BAM_TAG_TYPE_INT8   = 'c';
+const char BAM_TAG_TYPE_UINT8  = 'C';
+const char BAM_TAG_TYPE_INT16  = 's';
+const char BAM_TAG_TYPE_UINT16 = 'S';
+const char BAM_TAG_TYPE_INT32  = 'i';
+const char BAM_TAG_TYPE_UINT32 = 'I';
 const char BAM_TAG_TYPE_FLOAT  = 'f';
 const char BAM_TAG_TYPE_STRING = 'Z';
 const char BAM_TAG_TYPE_HEX    = 'H';
@@ -190,7 +190,7 @@ struct TagTypeHelper<int8_t> {
 
 template<>
 struct TagTypeHelper<uint16_t> {
-    static bool CanCovnertFrom(const char c) {
+    static bool CanConvertFrom(const char c) {
         return ( c == Constants::BAM_TAG_TYPE_ASCII ||
                  c == Constants::BAM_TAG_TYPE_UINT8 ||
                  c == Constants::BAM_TAG_TYPE_UINT16 );