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

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

diff --git a/src/utils/bamtools_filter_ruleparser.h b/src/utils/bamtools_filter_ruleparser.h
index 7e3b1fdc36758971b1de9fc947d43432250af4db..f3079eb561708af09db1ada331d7c9c1fcd8c47c 100644 (file)
--- a/src/utils/bamtools_filter_ruleparser.h
+++ b/src/utils/bamtools_filter_ruleparser.h
@@ -1,9 +1,8 @@
 // ***************************************************************************
 // bamtools_filter_ruleparser.h (c) 2010 Derek Barnett, Erik Garrison
 // Marth Lab, Department of Biology, Boston College
-// All rights reserved.
 // ---------------------------------------------------------------------------
-// Last modified: 21 September 2010
+// Last modified: 10 October 2011
 // ---------------------------------------------------------------------------
 // Provides a compound rule parser for FilterEngine.
 // ***************************************************************************
@@ -11,10 +10,10 @@
 #ifndef BAMTOOLS_FILTER_RULEPARSER_H
 #define BAMTOOLS_FILTER_RULEPARSER_H
 
+#include "utils/bamtools_utilities.h"
 #include <queue>
 #include <stack>
 #include <string>
-#include "bamtools_utilities.h"
 
 namespace BamTools {
 
@@ -54,7 +53,9 @@ inline int priority(const RuleToken& token) {
         case ( RuleToken::OR_OPERATOR  )      : return 1;
         case ( RuleToken::LEFT_PARENTHESIS )  : return 0;
         case ( RuleToken::RIGHT_PARENTHESIS ) : return 0;
-        default: BAMTOOLS_ASSERT_UNREACHABLE;
+        default:
+            BAMTOOLS_ASSERT_UNREACHABLE;
+            return -1;
     } 
 }
 
@@ -315,4 +316,4 @@ void RuleParser::skipSpaces(void) {
 
 } // namespace BamTools
 
-#endif // BAMTOOLS_FILTER_RULEPARSER_H
\ No newline at end of file
+#endif // BAMTOOLS_FILTER_RULEPARSER_H