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

pimpl OSRM lib with std::unique_ptr

Browse Source
This commit is contained in:
Dennis Luxen 2014-09-24 13:17:55 +02:00
parent 881041800b
commit f6f0de0e38
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/OSRM.h
View File

@ -30,6 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <osrm/ServerPaths.h> #include <osrm/ServerPaths.h>
#include <memory>
class OSRM_impl; class OSRM_impl;
struct RouteParameters; struct RouteParameters;
@ -41,7 +43,7 @@ class Reply;
class OSRM class OSRM
{ {
private: private:
OSRM_impl *OSRM_pimpl_; std::unique_ptr<OSRM_impl> OSRM_pimpl_;
public: public:
explicit OSRM(const ServerPaths &paths, const bool use_shared_memory = false); explicit OSRM(const ServerPaths &paths, const bool use_shared_memory = false);

5
Library/OSRM_impl.cpp
View File

@ -45,6 +45,7 @@ namespace boost { namespace interprocess { class named_mutex; } }
#include "../Server/DataStructures/InternalDataFacade.h" #include "../Server/DataStructures/InternalDataFacade.h"
#include "../Server/DataStructures/SharedBarriers.h" #include "../Server/DataStructures/SharedBarriers.h"
#include "../Server/DataStructures/SharedDataFacade.h" #include "../Server/DataStructures/SharedDataFacade.h"
#include "../Util/make_unique.hpp"
#include "../Util/SimpleLogger.h" #include "../Util/SimpleLogger.h"
#include <boost/assert.hpp> #include <boost/assert.hpp>
@ -155,11 +156,11 @@ void OSRM_impl::RunQuery(RouteParameters &route_parameters, http::Reply &reply)
// proxy code for compilation firewall // proxy code for compilation firewall
OSRM::OSRM(const ServerPaths &paths, const bool use_shared_memory) OSRM::OSRM(const ServerPaths &paths, const bool use_shared_memory)
: OSRM_pimpl_(new OSRM_impl(paths, use_shared_memory)) : OSRM_pimpl_(osrm::make_unique<OSRM_impl>(paths, use_shared_memory))
{ {
} }
OSRM::~OSRM() { delete OSRM_pimpl_; } OSRM::~OSRM() { OSRM_pimpl_.reset(); }
void OSRM::RunQuery(RouteParameters &route_parameters, http::Reply &reply) void OSRM::RunQuery(RouteParameters &route_parameters, http::Reply &reply)
{ {