Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Manuelly merging branch 'remove-lexical-cast2' into develop

Browse Source
This commit is contained in:
DennisOSRM 2013-05-22 11:56:43 +02:00
commit c39314c643
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Contractor/EdgeBasedGraphFactory.h
View File

@ -32,7 +32,6 @@
#include <cstdlib> #include <cstdlib>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

6
Server/BasicDatastructures.h
View File

@ -21,8 +21,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
#ifndef BASIC_DATASTRUCTURES_H #ifndef BASIC_DATASTRUCTURES_H
#define BASIC_DATASTRUCTURES_H #define BASIC_DATASTRUCTURES_H
#include <string> #include <string>
#include <sstream>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp>
#include "../Util/StringUtil.h" #include "../Util/StringUtil.h"
@ -143,7 +143,9 @@ Reply Reply::stockReply(Reply::status_type status) {
rep.headers[0].name = "Access-Control-Allow-Origin"; rep.headers[0].name = "Access-Control-Allow-Origin";
rep.headers[0].value = "*"; rep.headers[0].value = "*";
rep.headers[1].name = "Content-Length"; rep.headers[1].name = "Content-Length";
rep.headers[1].value = boost::lexical_cast<std::string>(rep.content.size()); std::ostringstream s;
s << rep.content.size();
rep.headers[1].value = s.str();
rep.headers[2].name = "Content-Type"; rep.headers[2].name = "Content-Type";
rep.headers[2].value = "text/html"; rep.headers[2].value = "text/html";
return rep; return rep;

1
Server/RequestHandler.h
View File

@ -25,7 +25,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include <cctype> // std::tolower #include <cctype> // std::tolower
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <boost/lexical_cast.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include "APIGrammar.h" #include "APIGrammar.h"