From 598f5519d109903861d234f94e4a2484e4aedc54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Rodrigo?= <fred.rodrigo@gmail.com>
Date: Mon, 5 Jan 2015 15:48:24 +0100
Subject: [PATCH] Remove setters from structures server_config

---
 Include/osrm/ServerConfig.h       | 15 +++++++-----
 Library/OSRM_impl.h               |  1 -
 data_structures/server_config.hpp | 39 -------------------------------
 routed.cpp                        |  5 +---
 4 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 data_structures/server_config.hpp

diff --git a/Include/osrm/ServerConfig.h b/Include/osrm/ServerConfig.h
index 4c6b52a1d..a3ffb11e2 100644
--- a/Include/osrm/ServerConfig.h
+++ b/Include/osrm/ServerConfig.h
@@ -32,13 +32,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct ServerConfig
 {
-    ServerConfig();
+    ServerConfig()
+        : use_shared_memory(false)
+        , max_locations_distance_table(100)
+    {}
 
-    void setServerPaths(const ServerPaths paths);
-
-    void setUseSharedMemory(const bool use_shared_memory);
-
-    void setMaxLocationsDistanceTable(const int max_locations_distance_table);
+    ServerConfig(const ServerPaths paths, const bool flag, const int max)
+        : server_paths(paths)
+        , use_shared_memory(flag)
+        , max_locations_distance_table(max)
+    {}
 
     ServerPaths server_paths;
     bool use_shared_memory;
diff --git a/Library/OSRM_impl.h b/Library/OSRM_impl.h
index 2b9639fb8..bf28c8bf9 100644
--- a/Library/OSRM_impl.h
+++ b/Library/OSRM_impl.h
@@ -34,7 +34,6 @@ struct RouteParameters;
 
 #include <osrm/ServerConfig.h>
 
-#include "../data_structures/server_config.hpp"
 #include "../data_structures/query_edge.hpp"
 
 #include <memory>
diff --git a/data_structures/server_config.hpp b/data_structures/server_config.hpp
deleted file mode 100644
index 7adbd5694..000000000
--- a/data_structures/server_config.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-
-Copyright (c) 2014, Project OSRM, Dennis Luxen, others
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list
-of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#include <osrm/ServerConfig.h>
-
-ServerConfig::ServerConfig()
-    : use_shared_memory(false), max_locations_distance_table(100)
-{
-}
-
-void ServerConfig::setServerPaths(const ServerPaths object) { server_paths = object; }
-
-void ServerConfig::setUseSharedMemory(const bool flag) { use_shared_memory = flag; }
-
-void ServerConfig::setMaxLocationsDistanceTable(const int max) { max_locations_distance_table = max; }
diff --git a/routed.cpp b/routed.cpp
index 6133577fc..8224c2e7b 100644
--- a/routed.cpp
+++ b/routed.cpp
@@ -118,10 +118,7 @@ int main(int argc, const char *argv[])
         pthread_sigmask(SIG_BLOCK, &new_mask, &old_mask);
 #endif
 
-        ServerConfig server_config;
-        server_config.setServerPaths(server_paths);
-        server_config.setUseSharedMemory(use_shared_memory);
-        server_config.setMaxLocationsDistanceTable(max_locations_distance_table);
+        ServerConfig server_config(server_paths, use_shared_memory, max_locations_distance_table);
         OSRM osrm_lib(server_config);
         auto routing_server =
             Server::CreateServer(ip_address, ip_port, requested_thread_num);