Remove setters from structures server_config

Project-OSRM · Jan 5, 2015 · 17bfa39 · 17bfa39
1 parent 84b000a
commit 17bfa39
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 51 deletions.
diff --git 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();
-
-    void setServerPaths(const ServerPaths paths);
-
-    void setUseSharedMemory(const bool use_shared_memory);
-
-    void setMaxLocationsDistanceTable(const int max_locations_distance_table);
+    ServerConfig()
+        : use_shared_memory(false)
+        , max_locations_distance_table(100)
+    {}
+
+    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
@@ -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
diff --git 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);