move tribool obj into request_parser

2016-01-28 18:43:19 -05:00
parent efee07e20b
commit 262cdd7bc0
4 changed files with 80 additions and 93 deletions
@@ -3,7 +3,6 @@

 #include "server/http/compression_type.hpp"
 #include "server/http/header.hpp"
-#include "util/tribool.hpp"

 #include <tuple>

@@ -22,11 +21,18 @@ class RequestParser
  public:
    RequestParser();

-    std::tuple<util::tribool, http::compression_type>
+    std::tuple<RequestStatus, http::compression_type>
    parse(http::request &current_request, char *begin, char *end);

+    enum class RequestStatus : char
+    {
+        valid,
+        invalid,
+        indeterminate
+    };
+
  private:
-    util::tribool consume(http::request &current_request, const char input);
+    RequestStatus consume(http::request &current_request, const char input);

    bool is_char(const int character) const;

@@ -1,17 +0,0 @@
-#ifndef TRIBOOL_HPP
-#define TRIBOOL_HPP
-
-namespace osrm
-{
-namespace util
-{
-
-enum class tribool : char
-{
-    yes,
-    no,
-    indeterminate
-};
-}
-}
-#endif // TRIBOOL_HPP