Major update to BamTools version 1.0

[bamtools.git] / src / utils / bamtools_utilities.h

diff --git a/src/utils/bamtools_utilities.h b/src/utils/bamtools_utilities.h
index e31f63a59f0882a9464b5cef84a1921db3ab616d..3701690fbc6f6a3499dcd3f744d04b5e8e06024f 100644 (file)
--- a/src/utils/bamtools_utilities.h
+++ b/src/utils/bamtools_utilities.h
@@ -3,7 +3,7 @@
 // Marth Lab, Department of Biology, Boston College
 // All rights reserved.
 // ---------------------------------------------------------------------------
-// Last modified: 23 September 2010
+// Last modified: 26 January 2011
 // ---------------------------------------------------------------------------
 // Provides general utilities used by BamTools sub-tools.
 // ***************************************************************************
@@ -11,10 +11,11 @@
 #ifndef BAMTOOLS_UTILITIES_H
 #define BAMTOOLS_UTILITIES_H
 
+#include <api/BamAux.h>
+#include <utils/utils_global.h>
 #include <cassert>
 #include <stdexcept>
 #include <string>
-#include "BamAux.h"
 
 #define BAMTOOLS_ASSERT_UNREACHABLE assert( false )
 #define BAMTOOLS_ASSERT_MESSAGE( condition, message ) if (!( condition )) throw std::runtime_error( message );
@@ -24,7 +25,7 @@ namespace BamTools {
 class BamReader;
 class BamMultiReader;
 
-class Utilities {
+class UTILS_EXPORT Utilities {
   
     public: 
         // check if a file exists
@@ -32,9 +33,13 @@ class Utilities {
         
         // Parses a region string, uses reader to do validation (valid ID's, positions), stores in Region struct
         // Returns success (true/false)
-        static bool ParseRegionString(const std::string& regionString, const BamReader& reader, BamRegion& region);
+        static bool ParseRegionString(const std::string& regionString,
+                                      const BamReader& reader,
+                                      BamRegion& region);
         // Same as above, but accepts a BamMultiReader
-        static bool ParseRegionString(const std::string& regionString, const BamMultiReader& reader, BamRegion& region);
+        static bool ParseRegionString(const std::string& regionString,
+                                      const BamMultiReader& reader,
+                                      BamRegion& region);
 
         // sequence utilities
         static void Reverse(std::string& sequence);