renamed: Util/DataStoreOptions.h -> Util/datastore_options.hpp

renamed:    Util/ProgramOptions.h -> Util/routed_options.hpp

Library/OSRM_impl.cpp

@@ -47,7 +47,7 @@ class named_mutex;
 #include "../server/data_structures/shared_barriers.hpp"
 #include "../server/data_structures/shared_datafacade.hpp"
 #include "../Util/make_unique.hpp"
-#include "../Util/ProgramOptions.h"
+#include "../Util/routed_options.hpp"
 #include "../Util/simple_logger.hpp"
 
 #include <boost/assert.hpp>

Util/datastore_options.hpp

@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef DATA_STORE_OPTIONS_H
-#define DATA_STORE_OPTIONS_H
+#ifndef DATASTORE_OPTIONS_HPP
+#define DATASTORE_OPTIONS_HPP
 
 #include "BoostFileSystemFix.h"
 #include "git_sha.hpp"
@@ -270,4 +270,4 @@ bool GenerateDataStoreOptions(const int argc, const char *argv[], ServerPaths &p
     return true;
 }
 
-#endif /* DATA_STORE_OPTIONS_H */
+#endif /* DATASTORE_OPTIONS_HPP */

Util/routed_options.hpp

@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef PROGAM_OPTIONS_H
-#define PROGAM_OPTIONS_H
+#ifndef ROUTED_OPTIONS_HPP
+#define ROUTED_OPTIONS_HPP
 
 #include "git_sha.hpp"
 #include "ini_file.hpp"
@@ -274,4 +274,4 @@ inline unsigned GenerateServerProgramOptions(const int argc,
     return INIT_OK_DO_NOT_START_ENGINE;
 }
 
-#endif /* PROGRAM_OPTIONS_H */
+#endif // ROUTED_OPTIONS_HPP

datastore.cpp

@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "server/data_structures/shared_datatype.hpp"
 #include "server/data_structures/shared_barriers.hpp"
 #include "Util/BoostFileSystemFix.h"
-#include "Util/DataStoreOptions.h"
+#include "Util/datastore_options.hpp"
 #include "Util/simple_logger.hpp"
 #include "Util/osrm_exception.hpp"
 #include "Util/fingerprint.hpp"

library/osrm_impl.cpp

@@ -47,7 +47,7 @@ class named_mutex;
 #include "../server/data_structures/shared_barriers.hpp"
 #include "../server/data_structures/shared_datafacade.hpp"
 #include "../Util/make_unique.hpp"
-#include "../Util/ProgramOptions.h"
+#include "../Util/routed_options.hpp"
 #include "../Util/simple_logger.hpp"
 
 #include <boost/assert.hpp>

routed.cpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "library/osrm.hpp"
 #include "server/server.hpp"
 #include "Util/git_sha.hpp"
-#include "Util/ProgramOptions.h"
+#include "Util/routed_options.hpp"
 #include "Util/simple_logger.hpp"
 
 #ifdef __linux__

tools/simpleclient.cpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../library/osrm.hpp"
 #include "../Util/git_sha.hpp"
 #include "../Util/json_renderer.hpp"
-#include "../Util/ProgramOptions.h"
+#include "../Util/routed_options.hpp"
 #include "../Util/simple_logger.hpp"
 
 #include <osrm/json_container.hpp>