From 14ab9f431251f583b0210411b153c7e76f93bb4d Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Fri, 10 Apr 2015 13:00:01 +0300 Subject: [PATCH] Fix include path for search --- search/algos.hpp | 6 +-- search/approximate_string_match.cpp | 2 +- search/approximate_string_match.hpp | 8 ++-- search/feature_offset_match.hpp | 24 +++++----- search/geometry_utils.cpp | 4 +- search/geometry_utils.hpp | 4 +- search/house_detector.cpp | 34 ++++++------- search/house_detector.hpp | 14 +++--- search/indexed_value.hpp | 8 ++-- search/intermediate_result.cpp | 24 +++++----- search/intermediate_result.hpp | 4 +- search/keyword_lang_matcher.cpp | 10 ++-- search/keyword_lang_matcher.hpp | 4 +- search/keyword_matcher.cpp | 10 ++-- search/keyword_matcher.hpp | 8 ++-- search/latlon_match.cpp | 16 +++---- search/latlon_match.hpp | 2 +- search/locality_finder.cpp | 6 +-- search/locality_finder.hpp | 10 ++-- search/params.cpp | 4 +- search/params.hpp | 6 +-- search/result.cpp | 4 +- search/result.hpp | 10 ++-- search/search_engine.cpp | 30 ++++++------ search/search_engine.hpp | 16 +++---- search/search_query.cpp | 48 +++++++++---------- search/search_query.hpp | 28 +++++------ search/search_string_intersection.hpp | 2 +- search/search_tests/algos_tests.cpp | 8 ++-- search/search_tests/house_detector_tests.cpp | 24 +++++----- .../keyword_lang_matcher_test.cpp | 12 ++--- search/search_tests/keyword_matcher_test.cpp | 20 ++++---- search/search_tests/latlon_match_test.cpp | 6 +-- search/search_tests/locality_finder_test.cpp | 8 ++-- .../search_tests/string_intersection_test.cpp | 10 ++-- search/search_tests/string_match_test.cpp | 12 ++--- search/search_trie.cpp | 6 +-- 37 files changed, 226 insertions(+), 226 deletions(-) diff --git a/search/algos.hpp b/search/algos.hpp index d33d34885a..bb5c5d89cd 100644 --- a/search/algos.hpp +++ b/search/algos.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../base/base.hpp" +#include "base/base.hpp" -#include "../std/algorithm.hpp" -#include "../std/vector.hpp" +#include "std/algorithm.hpp" +#include "std/vector.hpp" namespace search diff --git a/search/approximate_string_match.cpp b/search/approximate_string_match.cpp index 693cc4ba92..5bda6a2c7d 100644 --- a/search/approximate_string_match.cpp +++ b/search/approximate_string_match.cpp @@ -1,4 +1,4 @@ -#include "approximate_string_match.hpp" +#include "search/approximate_string_match.hpp" // TODO: Сделать модель ошибок. // Учитывать соседние кнопки на клавиатуре. diff --git a/search/approximate_string_match.hpp b/search/approximate_string_match.hpp index 34bfa392c9..ae98c41663 100644 --- a/search/approximate_string_match.hpp +++ b/search/approximate_string_match.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../indexer/search_string_utils.hpp" -#include "../base/base.hpp" -#include "../base/buffer_vector.hpp" -#include "../std/queue.hpp" +#include "indexer/search_string_utils.hpp" +#include "base/base.hpp" +#include "base/buffer_vector.hpp" +#include "std/queue.hpp" namespace search { diff --git a/search/feature_offset_match.hpp b/search/feature_offset_match.hpp index 78326b2fca..cea96d3df8 100644 --- a/search/feature_offset_match.hpp +++ b/search/feature_offset_match.hpp @@ -1,19 +1,19 @@ #pragma once -#include "search_common.hpp" +#include "search/search_common.hpp" -#include "../indexer/search_trie.hpp" +#include "indexer/search_trie.hpp" -#include "../base/string_utils.hpp" -#include "../base/stl_add.hpp" -#include "../base/scope_guard.hpp" -#include "../base/mutex.hpp" +#include "base/string_utils.hpp" +#include "base/stl_add.hpp" +#include "base/scope_guard.hpp" +#include "base/mutex.hpp" -#include "../std/algorithm.hpp" -#include "../std/unique_ptr.hpp" -#include "../std/unordered_set.hpp" -#include "../std/utility.hpp" -#include "../std/vector.hpp" -#include "../std/target_os.hpp" +#include "std/algorithm.hpp" +#include "std/unique_ptr.hpp" +#include "std/unordered_set.hpp" +#include "std/utility.hpp" +#include "std/vector.hpp" +#include "std/target_os.hpp" //#include "../sparsehash/dense_hash_set.hpp" diff --git a/search/geometry_utils.cpp b/search/geometry_utils.cpp index 51a2e0aabc..90a137e11d 100644 --- a/search/geometry_utils.cpp +++ b/search/geometry_utils.cpp @@ -1,6 +1,6 @@ -#include "geometry_utils.hpp" +#include "search/geometry_utils.hpp" -#include "../indexer/mercator.hpp" +#include "indexer/mercator.hpp" namespace search diff --git a/search/geometry_utils.hpp b/search/geometry_utils.hpp index f8531c223d..19c83e2cba 100644 --- a/search/geometry_utils.hpp +++ b/search/geometry_utils.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../geometry/point2d.hpp" -#include "../geometry/rect2d.hpp" +#include "geometry/point2d.hpp" +#include "geometry/rect2d.hpp" namespace search diff --git a/search/house_detector.cpp b/search/house_detector.cpp index fd5fa15c4b..2c927e7b12 100644 --- a/search/house_detector.cpp +++ b/search/house_detector.cpp @@ -1,27 +1,27 @@ -#include "algos.hpp" -#include "house_detector.hpp" -#include "search_common.hpp" +#include "search/algos.hpp" +#include "search/house_detector.hpp" +#include "search/search_common.hpp" -#include "../indexer/classificator.hpp" -#include "../indexer/feature_impl.hpp" +#include "indexer/feature_impl.hpp" +#include "indexer/classificator.hpp" -#include "../geometry/angles.hpp" -#include "../geometry/distance.hpp" +#include "geometry/distance.hpp" +#include "geometry/angles.hpp" -#include "../base/limited_priority_queue.hpp" -#include "../base/logging.hpp" -#include "../base/stl_iterator.hpp" +#include "base/logging.hpp" +#include "base/stl_iterator.hpp" +#include "base/limited_priority_queue.hpp" -#include "../std/bind.hpp" -#include "../std/numeric.hpp" -#include "../std/set.hpp" -#include "../std/transform_iterator.hpp" +#include "std/bind.hpp" +#include "std/numeric.hpp" +#include "std/set.hpp" +#include "std/transform_iterator.hpp" #ifdef DEBUG -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../std/fstream.hpp" -#include "../std/iostream.hpp" +#include "std/iostream.hpp" +#include "std/fstream.hpp" #endif diff --git a/search/house_detector.hpp b/search/house_detector.hpp index 555962acf5..f8e56b53a5 100644 --- a/search/house_detector.hpp +++ b/search/house_detector.hpp @@ -1,14 +1,14 @@ #pragma once -#include "indexed_value.hpp" +#include "search/indexed_value.hpp" -#include "../indexer/feature_decl.hpp" -#include "../indexer/index.hpp" -#include "../indexer/ftypes_matcher.hpp" +#include "indexer/feature_decl.hpp" +#include "indexer/index.hpp" +#include "indexer/ftypes_matcher.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../std/string.hpp" -#include "../std/queue.hpp" +#include "std/string.hpp" +#include "std/queue.hpp" namespace search diff --git a/search/indexed_value.hpp b/search/indexed_value.hpp index 3853823d45..d2bfbfbb86 100644 --- a/search/indexed_value.hpp +++ b/search/indexed_value.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../std/bind.hpp" -#include "../std/algorithm.hpp" -#include "../std/vector.hpp" -#include "../std/limits.hpp" +#include "std/bind.hpp" +#include "std/algorithm.hpp" +#include "std/vector.hpp" +#include "std/limits.hpp" namespace search diff --git a/search/intermediate_result.cpp b/search/intermediate_result.cpp index 579d1013a7..fb15a85d68 100644 --- a/search/intermediate_result.cpp +++ b/search/intermediate_result.cpp @@ -1,20 +1,20 @@ -#include "intermediate_result.hpp" -#include "geometry_utils.hpp" +#include "search/intermediate_result.hpp" +#include "search/geometry_utils.hpp" -#include "../map/measurement_utils.hpp" +#include "map/measurement_utils.hpp" -#include "../storage/country_info.hpp" +#include "storage/country_info.hpp" -#include "../indexer/ftypes_matcher.hpp" -#include "../indexer/classificator.hpp" -#include "../indexer/feature.hpp" -#include "../indexer/scales.hpp" -#include "../indexer/categories_holder.hpp" +#include "indexer/ftypes_matcher.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature.hpp" +#include "indexer/scales.hpp" +#include "indexer/categories_holder.hpp" -#include "../geometry/angles.hpp" +#include "geometry/angles.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" namespace search diff --git a/search/intermediate_result.hpp b/search/intermediate_result.hpp index 2f56e062c2..1626f2f5c1 100644 --- a/search/intermediate_result.hpp +++ b/search/intermediate_result.hpp @@ -1,7 +1,7 @@ #pragma once -#include "result.hpp" +#include "search/result.hpp" -#include "../indexer/feature_data.hpp" +#include "indexer/feature_data.hpp" class FeatureType; diff --git a/search/keyword_lang_matcher.cpp b/search/keyword_lang_matcher.cpp index 5abe7f0924..948b7be6d0 100644 --- a/search/keyword_lang_matcher.cpp +++ b/search/keyword_lang_matcher.cpp @@ -1,11 +1,11 @@ -#include "keyword_lang_matcher.hpp" +#include "search/keyword_lang_matcher.hpp" -#include "../indexer/search_string_utils.hpp" -#include "../indexer/search_delimiters.hpp" +#include "indexer/search_string_utils.hpp" +#include "indexer/search_delimiters.hpp" -#include "../base/stl_add.hpp" +#include "base/stl_add.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" namespace search diff --git a/search/keyword_lang_matcher.hpp b/search/keyword_lang_matcher.hpp index 8848751be2..dac86d2ca3 100644 --- a/search/keyword_lang_matcher.hpp +++ b/search/keyword_lang_matcher.hpp @@ -1,7 +1,7 @@ #pragma once -#include "keyword_matcher.hpp" +#include "search/keyword_matcher.hpp" -#include "../std/vector.hpp" +#include "std/vector.hpp" namespace search { diff --git a/search/keyword_matcher.cpp b/search/keyword_matcher.cpp index bb580cf9b7..ea2c7b5498 100644 --- a/search/keyword_matcher.cpp +++ b/search/keyword_matcher.cpp @@ -1,11 +1,11 @@ -#include "keyword_matcher.hpp" +#include "search/keyword_matcher.hpp" -#include "../indexer/search_delimiters.hpp" -#include "../indexer/search_string_utils.hpp" +#include "indexer/search_delimiters.hpp" +#include "indexer/search_string_utils.hpp" -#include "../base/stl_add.hpp" +#include "base/stl_add.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" namespace search { diff --git a/search/keyword_matcher.hpp b/search/keyword_matcher.hpp index 0ad1114bdf..1b81b8a7a7 100644 --- a/search/keyword_matcher.hpp +++ b/search/keyword_matcher.hpp @@ -1,10 +1,10 @@ #pragma once -#include "search_common.hpp" +#include "search/search_common.hpp" -#include "../base/string_utils.hpp" +#include "base/string_utils.hpp" -#include "../std/string.hpp" -#include "../std/vector.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" namespace search { diff --git a/search/latlon_match.cpp b/search/latlon_match.cpp index 4d9b19fcd1..4297310255 100644 --- a/search/latlon_match.cpp +++ b/search/latlon_match.cpp @@ -1,13 +1,13 @@ -#include "latlon_match.hpp" +#include "search/latlon_match.hpp" -#include "../base/macros.hpp" +#include "base/macros.hpp" -#include "../std/array.hpp" -#include "../std/cmath.hpp" -#include "../std/cstdlib.hpp" -#include "../std/cstring.hpp" -#include "../std/algorithm.hpp" -#include "../std/utility.hpp" +#include "std/array.hpp" +#include "std/cmath.hpp" +#include "std/cstdlib.hpp" +#include "std/cstring.hpp" +#include "std/algorithm.hpp" +#include "std/utility.hpp" namespace search diff --git a/search/latlon_match.hpp b/search/latlon_match.hpp index 122b8b9fb5..a35a7f2f20 100644 --- a/search/latlon_match.hpp +++ b/search/latlon_match.hpp @@ -1,5 +1,5 @@ #pragma once -#include "../std/string.hpp" +#include "std/string.hpp" namespace search diff --git a/search/locality_finder.cpp b/search/locality_finder.cpp index aa6f78b20f..eb51399aaf 100644 --- a/search/locality_finder.cpp +++ b/search/locality_finder.cpp @@ -1,7 +1,7 @@ -#include "locality_finder.hpp" +#include "search/locality_finder.hpp" -#include "../indexer/ftypes_matcher.hpp" -#include "../indexer/features_vector.hpp" +#include "indexer/ftypes_matcher.hpp" +#include "indexer/features_vector.hpp" namespace search diff --git a/search/locality_finder.hpp b/search/locality_finder.hpp index 08741d5ba5..044ce9310a 100644 --- a/search/locality_finder.hpp +++ b/search/locality_finder.hpp @@ -1,12 +1,12 @@ #pragma once -#include "../indexer/index.hpp" +#include "indexer/index.hpp" -#include "../geometry/point2d.hpp" -#include "../geometry/rect2d.hpp" -#include "../geometry/tree4d.hpp" +#include "geometry/point2d.hpp" +#include "geometry/rect2d.hpp" +#include "geometry/tree4d.hpp" -#include "../std/set.hpp" +#include "std/set.hpp" class Index; diff --git a/search/params.cpp b/search/params.cpp index b878220455..0a66004588 100644 --- a/search/params.cpp +++ b/search/params.cpp @@ -1,6 +1,6 @@ -#include "params.hpp" +#include "search/params.hpp" -#include "../coding/multilang_utf8_string.hpp" +#include "coding/multilang_utf8_string.hpp" namespace search diff --git a/search/params.hpp b/search/params.hpp index e4b27d7a0a..13ac8feca7 100644 --- a/search/params.hpp +++ b/search/params.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../std/function.hpp" -#include "../std/string.hpp" +#include "std/function.hpp" +#include "std/string.hpp" namespace search diff --git a/search/result.cpp b/search/result.cpp index 9b9db3d1b4..5546e7d9fb 100644 --- a/search/result.cpp +++ b/search/result.cpp @@ -1,5 +1,5 @@ -#include "result.hpp" -#include "geometry_utils.hpp" +#include "search/result.hpp" +#include "search/geometry_utils.hpp" namespace search diff --git a/search/result.hpp b/search/result.hpp index eaaa180aea..9ffee5e29a 100644 --- a/search/result.hpp +++ b/search/result.hpp @@ -1,12 +1,12 @@ #pragma once -#include "../indexer/feature_decl.hpp" +#include "indexer/feature_decl.hpp" -#include "../geometry/point2d.hpp" -#include "../geometry/rect2d.hpp" +#include "geometry/point2d.hpp" +#include "geometry/rect2d.hpp" -#include "../base/buffer_vector.hpp" +#include "base/buffer_vector.hpp" -#include "../std/string.hpp" +#include "std/string.hpp" namespace search diff --git a/search/search_engine.cpp b/search/search_engine.cpp index c6418ea7da..f9669b248f 100644 --- a/search/search_engine.cpp +++ b/search/search_engine.cpp @@ -1,25 +1,25 @@ -#include "search_engine.hpp" -#include "search_query.hpp" +#include "search/search_engine.hpp" +#include "search/search_query.hpp" -#include "../storage/country_info.hpp" +#include "storage/country_info.hpp" -#include "../indexer/categories_holder.hpp" -#include "../indexer/search_string_utils.hpp" -#include "../indexer/mercator.hpp" -#include "../indexer/scales.hpp" -#include "../indexer/classificator.hpp" +#include "indexer/categories_holder.hpp" +#include "indexer/search_string_utils.hpp" +#include "indexer/mercator.hpp" +#include "indexer/scales.hpp" +#include "indexer/classificator.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../geometry/distance_on_sphere.hpp" +#include "geometry/distance_on_sphere.hpp" -#include "../base/stl_add.hpp" +#include "base/stl_add.hpp" -#include "../std/map.hpp" -#include "../std/vector.hpp" -#include "../std/bind.hpp" +#include "std/map.hpp" +#include "std/vector.hpp" +#include "std/bind.hpp" -#include "../3party/Alohalytics/src/alohalytics.h" +#include "3party/Alohalytics/src/alohalytics.h" namespace search diff --git a/search/search_engine.hpp b/search/search_engine.hpp index e41f1eb6bd..6242bd7e23 100644 --- a/search/search_engine.hpp +++ b/search/search_engine.hpp @@ -1,17 +1,17 @@ #pragma once -#include "params.hpp" -#include "result.hpp" +#include "search/params.hpp" +#include "search/result.hpp" -#include "../geometry/rect2d.hpp" +#include "geometry/rect2d.hpp" -#include "../coding/reader.hpp" +#include "coding/reader.hpp" -#include "../base/mutex.hpp" +#include "base/mutex.hpp" -#include "../std/unique_ptr.hpp" -#include "../std/string.hpp" -#include "../std/function.hpp" +#include "std/unique_ptr.hpp" +#include "std/string.hpp" +#include "std/function.hpp" class Index; diff --git a/search/search_query.cpp b/search/search_query.cpp index db01f8eb0a..5031606845 100644 --- a/search/search_query.cpp +++ b/search/search_query.cpp @@ -1,33 +1,33 @@ -#include "search_query.hpp" -#include "feature_offset_match.hpp" -#include "latlon_match.hpp" -#include "search_common.hpp" -#include "indexed_value.hpp" -#include "geometry_utils.hpp" -#include "search_string_intersection.hpp" +#include "search/search_query.hpp" +#include "search/feature_offset_match.hpp" +#include "search/latlon_match.hpp" +#include "search/search_common.hpp" +#include "search/indexed_value.hpp" +#include "search/geometry_utils.hpp" +#include "search/search_string_intersection.hpp" -#include "../storage/country_info.hpp" +#include "storage/country_info.hpp" -#include "../indexer/feature_impl.hpp" -#include "../indexer/feature_covering.hpp" -#include "../indexer/features_vector.hpp" -#include "../indexer/index.hpp" -#include "../indexer/scales.hpp" -#include "../indexer/search_delimiters.hpp" -#include "../indexer/search_string_utils.hpp" -#include "../indexer/categories_holder.hpp" -#include "../indexer/classificator.hpp" +#include "indexer/feature_impl.hpp" +#include "indexer/feature_covering.hpp" +#include "indexer/features_vector.hpp" +#include "indexer/index.hpp" +#include "indexer/scales.hpp" +#include "indexer/search_delimiters.hpp" +#include "indexer/search_string_utils.hpp" +#include "indexer/categories_holder.hpp" +#include "indexer/classificator.hpp" -#include "../platform/preferred_languages.hpp" +#include "platform/preferred_languages.hpp" -#include "../coding/multilang_utf8_string.hpp" -#include "../coding/reader_wrapper.hpp" +#include "coding/multilang_utf8_string.hpp" +#include "coding/reader_wrapper.hpp" -#include "../base/logging.hpp" -#include "../base/string_utils.hpp" -#include "../base/stl_add.hpp" +#include "base/logging.hpp" +#include "base/string_utils.hpp" +#include "base/stl_add.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" namespace search diff --git a/search/search_query.hpp b/search/search_query.hpp index f16b105997..10484e3031 100644 --- a/search/search_query.hpp +++ b/search/search_query.hpp @@ -1,32 +1,32 @@ #pragma once -#include "intermediate_result.hpp" -#include "keyword_lang_matcher.hpp" +#include "search/intermediate_result.hpp" +#include "search/keyword_lang_matcher.hpp" -#include "../indexer/ftypes_matcher.hpp" -#include "../indexer/search_trie.hpp" +#include "indexer/ftypes_matcher.hpp" +#include "indexer/search_trie.hpp" #include "../indexer/index.hpp" // for Index::MwmLock -#include "../geometry/rect2d.hpp" +#include "geometry/rect2d.hpp" -#include "../base/buffer_vector.hpp" -#include "../base/limited_priority_queue.hpp" -#include "../base/string_utils.hpp" +#include "base/buffer_vector.hpp" +#include "base/limited_priority_queue.hpp" +#include "base/string_utils.hpp" -#include "../std/map.hpp" -#include "../std/string.hpp" -#include "../std/unordered_set.hpp" -#include "../std/vector.hpp" +#include "std/map.hpp" +#include "std/string.hpp" +#include "std/unordered_set.hpp" +#include "std/vector.hpp" #define HOUSE_SEARCH_TEST #define FIND_LOCALITY_TEST #ifdef HOUSE_SEARCH_TEST -#include "house_detector.hpp" +#include "search/house_detector.hpp" #endif #ifdef FIND_LOCALITY_TEST -#include "locality_finder.hpp" +#include "search/locality_finder.hpp" #endif diff --git a/search/search_string_intersection.hpp b/search/search_string_intersection.hpp index 80d1add91f..377e8e35d2 100644 --- a/search/search_string_intersection.hpp +++ b/search/search_string_intersection.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../indexer/search_delimiters.hpp" +#include "indexer/search_delimiters.hpp" namespace search diff --git a/search/search_tests/algos_tests.cpp b/search/search_tests/algos_tests.cpp index ca56106560..db4c4cb4dc 100644 --- a/search/search_tests/algos_tests.cpp +++ b/search/search_tests/algos_tests.cpp @@ -1,9 +1,9 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../algos.hpp" +#include "search/algos.hpp" -#include "../../std/algorithm.hpp" -#include "../../std/iterator.hpp" +#include "std/algorithm.hpp" +#include "std/iterator.hpp" namespace diff --git a/search/search_tests/house_detector_tests.cpp b/search/search_tests/house_detector_tests.cpp index a21c1f91c8..823a8f808b 100644 --- a/search/search_tests/house_detector_tests.cpp +++ b/search/search_tests/house_detector_tests.cpp @@ -1,21 +1,21 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../house_detector.hpp" +#include "search/house_detector.hpp" -#include "../../base/logging.hpp" +#include "base/logging.hpp" -#include "../../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../../geometry/distance_on_sphere.hpp" +#include "geometry/distance_on_sphere.hpp" -#include "../../indexer/classificator_loader.hpp" -#include "../../indexer/data_header.hpp" -#include "../../indexer/ftypes_matcher.hpp" -#include "../../indexer/index.hpp" -#include "../../indexer/scales.hpp" +#include "indexer/classificator_loader.hpp" +#include "indexer/data_header.hpp" +#include "indexer/ftypes_matcher.hpp" +#include "indexer/index.hpp" +#include "indexer/scales.hpp" -#include "../../std/iostream.hpp" -#include "../../std/fstream.hpp" +#include "std/iostream.hpp" +#include "std/fstream.hpp" class StreetIDsByName diff --git a/search/search_tests/keyword_lang_matcher_test.cpp b/search/search_tests/keyword_lang_matcher_test.cpp index 0402d4dbb0..27f7138529 100644 --- a/search/search_tests/keyword_lang_matcher_test.cpp +++ b/search/search_tests/keyword_lang_matcher_test.cpp @@ -1,12 +1,12 @@ -#include "../../testing/testing.hpp" -#include "../keyword_lang_matcher.hpp" +#include "testing/testing.hpp" +#include "search/keyword_lang_matcher.hpp" -#include "../../indexer/search_delimiters.hpp" -#include "../../indexer/search_string_utils.hpp" +#include "indexer/search_delimiters.hpp" +#include "indexer/search_string_utils.hpp" -#include "../../base/stl_add.hpp" +#include "base/stl_add.hpp" -#include "../../std/vector.hpp" +#include "std/vector.hpp" namespace { diff --git a/search/search_tests/keyword_matcher_test.cpp b/search/search_tests/keyword_matcher_test.cpp index 8531200bbf..04aaeb7536 100644 --- a/search/search_tests/keyword_matcher_test.cpp +++ b/search/search_tests/keyword_matcher_test.cpp @@ -1,17 +1,17 @@ -#include "../../testing/testing.hpp" -#include "../keyword_matcher.hpp" +#include "testing/testing.hpp" +#include "search/keyword_matcher.hpp" -#include "../search_common.hpp" +#include "search/search_common.hpp" -#include "../../indexer/search_string_utils.hpp" -#include "../../indexer/search_delimiters.hpp" +#include "indexer/search_string_utils.hpp" +#include "indexer/search_delimiters.hpp" -#include "../../base/buffer_vector.hpp" -#include "../../base/stl_add.hpp" +#include "base/buffer_vector.hpp" +#include "base/stl_add.hpp" -#include "../../std/scoped_ptr.hpp" -#include "../../std/sstream.hpp" -#include "../../std/vector.hpp" +#include "std/scoped_ptr.hpp" +#include "std/sstream.hpp" +#include "std/vector.hpp" namespace { diff --git a/search/search_tests/latlon_match_test.cpp b/search/search_tests/latlon_match_test.cpp index 8d513d7f8a..3d25853415 100644 --- a/search/search_tests/latlon_match_test.cpp +++ b/search/search_tests/latlon_match_test.cpp @@ -1,6 +1,6 @@ -#include "../../testing/testing.hpp" -#include "../latlon_match.hpp" -#include "../../std/utility.hpp" +#include "testing/testing.hpp" +#include "search/latlon_match.hpp" +#include "std/utility.hpp" namespace { diff --git a/search/search_tests/locality_finder_test.cpp b/search/search_tests/locality_finder_test.cpp index 5179d1a48a..27cdc444b2 100644 --- a/search/search_tests/locality_finder_test.cpp +++ b/search/search_tests/locality_finder_test.cpp @@ -1,9 +1,9 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../../indexer/data_header.hpp" -#include "../../indexer/index.hpp" +#include "indexer/data_header.hpp" +#include "indexer/index.hpp" -#include "../locality_finder.hpp" +#include "search/locality_finder.hpp" namespace { diff --git a/search/search_tests/string_intersection_test.cpp b/search/search_tests/string_intersection_test.cpp index ca690aefdc..1923556778 100644 --- a/search/search_tests/string_intersection_test.cpp +++ b/search/search_tests/string_intersection_test.cpp @@ -1,12 +1,12 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../search_string_intersection.hpp" +#include "search/search_string_intersection.hpp" -#include "../../indexer/feature_covering.hpp" +#include "indexer/feature_covering.hpp" -#include "../../base/logging.hpp" +#include "base/logging.hpp" -#include "../../std/cstdarg.hpp" +#include "std/cstdarg.hpp" namespace diff --git a/search/search_tests/string_match_test.cpp b/search/search_tests/string_match_test.cpp index d898669772..36b0e21b8d 100644 --- a/search/search_tests/string_match_test.cpp +++ b/search/search_tests/string_match_test.cpp @@ -1,13 +1,13 @@ -#include "../../testing/testing.hpp" -#include "../approximate_string_match.hpp" +#include "testing/testing.hpp" +#include "search/approximate_string_match.hpp" -#include "match_cost_mock.hpp" +#include "search/search_tests/match_cost_mock.hpp" -#include "../../indexer/search_delimiters.hpp" +#include "indexer/search_delimiters.hpp" -#include "../../base/stl_add.hpp" +#include "base/stl_add.hpp" -#include "../../std/cstring.hpp" +#include "std/cstring.hpp" using namespace search; diff --git a/search/search_trie.cpp b/search/search_trie.cpp index 0f1dc0fac8..623f914f4c 100644 --- a/search/search_trie.cpp +++ b/search/search_trie.cpp @@ -1,5 +1,5 @@ -#include "search_trie.hpp" -#include "" -#include "../coding/writer.hpp" +#include "search/search_trie.hpp" +#include "search" +#include "coding/writer.hpp" void Build(FeaturesVector const & featuresVector, Writer & writer);