From 54a917310796adc6e91c5872fe064c5ce03ecfa7 Mon Sep 17 00:00:00 2001
From: "Daniel J. Hofmann" <daniel@trvx.org>
Date: Thu, 21 Jan 2016 12:03:33 +0100
Subject: [PATCH] Make public RouteParameters header no longer depend on Spirit

And includes the optional header that was transitively included by the
spirit header before. Hopefully this will speed up compile times, as the
RouteParameters header is used in a lot of translation units.
---
 include/engine/route_parameters.hpp | 3 +--
 include/server/api_grammar.hpp      | 2 +-
 src/engine/route_parameters.cpp     | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/engine/route_parameters.hpp b/include/engine/route_parameters.hpp
index e808880ec..b77207e32 100644
--- a/include/engine/route_parameters.hpp
+++ b/include/engine/route_parameters.hpp
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "osrm/coordinate.hpp"
 
 #include <boost/fusion/container/vector/vector_fwd.hpp>
-#include <boost/spirit/include/qi.hpp>
+#include <boost/optional/optional.hpp>
 
 #include <string>
 #include <vector>
@@ -78,7 +78,6 @@ struct RouteParameters
     void AddTimestamp(const unsigned timestamp);
 
     void AddBearing(const boost::fusion::vector<int, boost::optional<int>> &received_bearing,
-                    boost::spirit::qi::unused_type unused,
                     bool &pass);
 
     void SetLanguage(const std::string &language);
diff --git a/include/server/api_grammar.hpp b/include/server/api_grammar.hpp
index afa577e1c..a0bfce60d 100644
--- a/include/server/api_grammar.hpp
+++ b/include/server/api_grammar.hpp
@@ -64,7 +64,7 @@ template <typename Iterator, class HandlerT> struct APIGrammar : qi::grammar<Ite
         bearing = (-qi::lit('&')) >> qi::lit("b") >> '=' >>
                   (qi::int_ >>
                    -(qi::lit(',') >> qi::int_ |
-                     qi::attr(10)))[boost::bind(&HandlerT::AddBearing, handler, ::_1, ::_2, ::_3)];
+                     qi::attr(10)))[boost::bind(&HandlerT::AddBearing, handler, ::_1, ::_3)];
         u = (-qi::lit('&')) >> qi::lit("u") >> '=' >>
             qi::bool_[boost::bind(&HandlerT::SetUTurn, handler, ::_1)];
         uturns = (-qi::lit('&')) >> qi::lit("uturns") >> '=' >>
diff --git a/src/engine/route_parameters.cpp b/src/engine/route_parameters.cpp
index 01df5783d..bc77c17ae 100644
--- a/src/engine/route_parameters.cpp
+++ b/src/engine/route_parameters.cpp
@@ -100,7 +100,6 @@ void RouteParameters::AddTimestamp(const unsigned timestamp)
 
 void RouteParameters::AddBearing(
     const boost::fusion::vector<int, boost::optional<int>> &received_bearing,
-    boost::spirit::qi::unused_type /* unused */,
     bool &pass)
 {
     pass = false;