Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2018-03-27 11:06:31 +0300
committerTatiana Yan <tatiana.kondakova@gmail.com>2018-03-27 15:41:12 +0300
commit310e1416ef68fe610ffdec4d03d692a4878a7069 (patch)
treed7e4570ee6ffa64a2e4b19eb43ae5721d5c8e364 /routing
parent2f7b60b0005f877d30de35de54f2bdb04afa2946 (diff)
Moving routing_algorithm.hpp and cpp to routing_tests.
Diffstat (limited to 'routing')
-rw-r--r--routing/CMakeLists.txt2
-rw-r--r--routing/routing_tests/CMakeLists.txt2
-rw-r--r--routing/routing_tests/astar_router_test.cpp2
-rw-r--r--routing/routing_tests/routing_algorithm.cpp (renamed from routing/routing_algorithm.cpp)2
-rw-r--r--routing/routing_tests/routing_algorithm.hpp (renamed from routing/routing_algorithm.hpp)0
5 files changed, 4 insertions, 4 deletions
diff --git a/routing/CMakeLists.txt b/routing/CMakeLists.txt
index 1d86df5670..5f6e1d90d3 100644
--- a/routing/CMakeLists.txt
+++ b/routing/CMakeLists.txt
@@ -90,8 +90,6 @@ set(
router.hpp
router_delegate.cpp
router_delegate.hpp
- routing_algorithm.cpp
- routing_algorithm.hpp
routing_exceptions.hpp
routing_helpers.cpp
routing_helpers.hpp
diff --git a/routing/routing_tests/CMakeLists.txt b/routing/routing_tests/CMakeLists.txt
index 5a1f98e9ab..856cbf6d9d 100644
--- a/routing/routing_tests/CMakeLists.txt
+++ b/routing/routing_tests/CMakeLists.txt
@@ -24,6 +24,8 @@ set(
road_graph_builder.hpp
road_graph_nearest_edges_test.cpp
route_tests.cpp
+ routing_algorithm.cpp
+ routing_algorithm.hpp
routing_helpers_tests.cpp
routing_session_test.cpp
turns_generator_test.cpp
diff --git a/routing/routing_tests/astar_router_test.cpp b/routing/routing_tests/astar_router_test.cpp
index 1b41e723e0..3584aefa32 100644
--- a/routing/routing_tests/astar_router_test.cpp
+++ b/routing/routing_tests/astar_router_test.cpp
@@ -1,8 +1,8 @@
#include "testing/testing.hpp"
#include "routing/routing_tests/road_graph_builder.hpp"
+#include "routing/routing_tests/routing_algorithm.hpp"
-#include "routing/routing_algorithm.hpp"
#include "routing/features_road_graph.hpp"
#include "routing/route.hpp"
#include "routing/router_delegate.hpp"
diff --git a/routing/routing_algorithm.cpp b/routing/routing_tests/routing_algorithm.cpp
index cc02d28a1c..f7821d899a 100644
--- a/routing/routing_algorithm.cpp
+++ b/routing/routing_tests/routing_algorithm.cpp
@@ -1,4 +1,4 @@
-#include "routing/routing_algorithm.hpp"
+#include "routing/routing_tests/routing_algorithm.hpp"
#include "routing/base/astar_algorithm.hpp"
#include "routing/base/astar_progress.hpp"
diff --git a/routing/routing_algorithm.hpp b/routing/routing_tests/routing_algorithm.hpp
index e1eb72467b..e1eb72467b 100644
--- a/routing/routing_algorithm.hpp
+++ b/routing/routing_tests/routing_algorithm.hpp