diff options
105 files changed, 595 insertions, 596 deletions
diff --git a/indexer/categories_holder.cpp b/indexer/categories_holder.cpp index a3669cec7c..293a620d0e 100644 --- a/indexer/categories_holder.cpp +++ b/indexer/categories_holder.cpp @@ -1,13 +1,13 @@ -#include "categories_holder.hpp" -#include "search_delimiters.hpp" -#include "search_string_utils.hpp" -#include "classificator.hpp" +#include "indexer/categories_holder.hpp" +#include "indexer/search_delimiters.hpp" +#include "indexer/search_string_utils.hpp" +#include "indexer/classificator.hpp" -#include "../coding/reader.hpp" -#include "../coding/reader_streambuf.hpp" +#include "coding/reader.hpp" +#include "coding/reader_streambuf.hpp" -#include "../base/logging.hpp" -#include "../base/stl_add.hpp" +#include "base/logging.hpp" +#include "base/stl_add.hpp" namespace diff --git a/indexer/categories_holder.hpp b/indexer/categories_holder.hpp index 90a5dcf5bc..b6717020ad 100644 --- a/indexer/categories_holder.hpp +++ b/indexer/categories_holder.hpp @@ -1,11 +1,11 @@ #pragma once -#include "../base/string_utils.hpp" +#include "base/string_utils.hpp" -#include "../std/vector.hpp" -#include "../std/map.hpp" -#include "../std/string.hpp" -#include "../std/iostream.hpp" -#include "../std/shared_ptr.hpp" +#include "std/vector.hpp" +#include "std/map.hpp" +#include "std/string.hpp" +#include "std/iostream.hpp" +#include "std/shared_ptr.hpp" class Reader; diff --git a/indexer/cell_coverer.hpp b/indexer/cell_coverer.hpp index d08bac64fe..d36f03bee7 100644 --- a/indexer/cell_coverer.hpp +++ b/indexer/cell_coverer.hpp @@ -1,9 +1,9 @@ #pragma once -#include "cell_id.hpp" +#include "indexer/cell_id.hpp" -#include "../std/queue.hpp" -#include "../std/vector.hpp" +#include "std/queue.hpp" +#include "std/vector.hpp" // TODO: Move neccessary functions to geometry/covering_utils.hpp and delete this file. diff --git a/indexer/cell_id.hpp b/indexer/cell_id.hpp index e4779d36eb..d9babb1378 100644 --- a/indexer/cell_id.hpp +++ b/indexer/cell_id.hpp @@ -1,8 +1,8 @@ #pragma once -#include "mercator.hpp" -#include "point_to_int64.hpp" +#include "indexer/mercator.hpp" +#include "indexer/point_to_int64.hpp" -#include "../base/assert.hpp" +#include "base/assert.hpp" template <int MinX, int MinY, int MaxX, int MaxY> diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp index 9220c5d201..cdf596a702 100644 --- a/indexer/classificator.cpp +++ b/indexer/classificator.cpp @@ -1,12 +1,12 @@ -#include "classificator.hpp" -#include "tree_structure.hpp" +#include "indexer/classificator.hpp" +#include "indexer/tree_structure.hpp" -#include "../base/macros.hpp" -#include "../base/logging.hpp" +#include "base/macros.hpp" +#include "base/logging.hpp" -#include "../std/bind.hpp" -#include "../std/algorithm.hpp" -#include "../std/iterator.hpp" +#include "std/bind.hpp" +#include "std/algorithm.hpp" +#include "std/iterator.hpp" ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/indexer/classificator.hpp b/indexer/classificator.hpp index 05e156e30c..bec2aa1d2d 100644 --- a/indexer/classificator.hpp +++ b/indexer/classificator.hpp @@ -1,15 +1,15 @@ #pragma once -#include "drawing_rule_def.hpp" -#include "types_mapping.hpp" -#include "scales.hpp" -#include "feature_decl.hpp" - -#include "../std/vector.hpp" -#include "../std/string.hpp" -#include "../std/iostream.hpp" -#include "../std/bitset.hpp" -#include "../std/noncopyable.hpp" -#include "../std/initializer_list.hpp" +#include "indexer/drawing_rule_def.hpp" +#include "indexer/types_mapping.hpp" +#include "indexer/scales.hpp" +#include "indexer/feature_decl.hpp" + +#include "std/vector.hpp" +#include "std/string.hpp" +#include "std/iostream.hpp" +#include "std/bitset.hpp" +#include "std/noncopyable.hpp" +#include "std/initializer_list.hpp" class ClassifObject; diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp index 2b4e1cb333..789515dd54 100644 --- a/indexer/classificator_loader.cpp +++ b/indexer/classificator_loader.cpp @@ -1,14 +1,14 @@ -#include "classificator_loader.hpp" -#include "classificator.hpp" -#include "drawing_rules.hpp" +#include "indexer/classificator_loader.hpp" +#include "indexer/classificator.hpp" +#include "indexer/drawing_rules.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../coding/reader_streambuf.hpp" +#include "coding/reader_streambuf.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" -#include "../std/iostream.hpp" +#include "std/iostream.hpp" namespace diff --git a/indexer/classificator_loader.hpp b/indexer/classificator_loader.hpp index b2ac33f8b4..0d021c2dfd 100644 --- a/indexer/classificator_loader.hpp +++ b/indexer/classificator_loader.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/string.hpp" +#include "std/string.hpp" namespace classificator diff --git a/indexer/coding_params.cpp b/indexer/coding_params.cpp index 67484de690..d570eeaa13 100644 --- a/indexer/coding_params.cpp +++ b/indexer/coding_params.cpp @@ -1,7 +1,7 @@ -#include "coding_params.hpp" -#include "point_to_int64.hpp" +#include "indexer/coding_params.hpp" +#include "indexer/point_to_int64.hpp" -#include "../geometry/pointu_to_uint64.hpp" +#include "geometry/pointu_to_uint64.hpp" namespace serial diff --git a/indexer/coding_params.hpp b/indexer/coding_params.hpp index 98eb92c884..ecc285b6e5 100644 --- a/indexer/coding_params.hpp +++ b/indexer/coding_params.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../coding/varint.hpp" +#include "coding/varint.hpp" namespace serial diff --git a/indexer/data_factory.cpp b/indexer/data_factory.cpp index 8a8516848e..bec67e9a92 100644 --- a/indexer/data_factory.cpp +++ b/indexer/data_factory.cpp @@ -1,14 +1,14 @@ -#include "../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "data_factory.hpp" -#include "interval_index.hpp" -#include "old/interval_index_101.hpp" -#include "mwm_version.hpp" +#include "indexer/data_factory.hpp" +#include "indexer/interval_index.hpp" +#include "indexer/old/interval_index_101.hpp" +#include "indexer/mwm_version.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../coding/file_reader.hpp" -#include "../coding/file_container.hpp" +#include "coding/file_reader.hpp" +#include "coding/file_container.hpp" namespace { diff --git a/indexer/data_factory.hpp b/indexer/data_factory.hpp index afdc297284..ff30b639e2 100644 --- a/indexer/data_factory.hpp +++ b/indexer/data_factory.hpp @@ -1,8 +1,8 @@ #pragma once -#include "data_header.hpp" -#include "mwm_version.hpp" +#include "indexer/data_header.hpp" +#include "indexer/mwm_version.hpp" -#include "../coding/reader.hpp" +#include "coding/reader.hpp" class FilesContainerR; diff --git a/indexer/data_header.cpp b/indexer/data_header.cpp index b3fb87f147..726852f725 100644 --- a/indexer/data_header.cpp +++ b/indexer/data_header.cpp @@ -1,14 +1,14 @@ -#include "data_header.hpp" -#include "point_to_int64.hpp" -#include "scales.hpp" +#include "indexer/data_header.hpp" +#include "indexer/point_to_int64.hpp" +#include "indexer/scales.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../coding/file_reader.hpp" -#include "../coding/file_writer.hpp" -#include "../coding/file_container.hpp" -#include "../coding/write_to_sink.hpp" -#include "../coding/varint.hpp" +#include "coding/file_reader.hpp" +#include "coding/file_writer.hpp" +#include "coding/file_container.hpp" +#include "coding/write_to_sink.hpp" +#include "coding/varint.hpp" namespace feature diff --git a/indexer/data_header.hpp b/indexer/data_header.hpp index 32a3b064f7..662726eae5 100644 --- a/indexer/data_header.hpp +++ b/indexer/data_header.hpp @@ -1,11 +1,11 @@ #pragma once -#include "coding_params.hpp" -#include "mwm_version.hpp" +#include "indexer/coding_params.hpp" +#include "indexer/mwm_version.hpp" -#include "../geometry/rect2d.hpp" +#include "geometry/rect2d.hpp" -#include "../base/buffer_vector.hpp" +#include "base/buffer_vector.hpp" class ModelReaderPtr; diff --git a/indexer/drawing_rule_def.cpp b/indexer/drawing_rule_def.cpp index 3b305faa4f..197d7e1ee4 100644 --- a/indexer/drawing_rule_def.cpp +++ b/indexer/drawing_rule_def.cpp @@ -1,7 +1,7 @@ -#include "drawing_rule_def.hpp" +#include "indexer/drawing_rule_def.hpp" -#include "../std/iterator.hpp" -#include "../std/algorithm.hpp" +#include "std/iterator.hpp" +#include "std/algorithm.hpp" namespace drule diff --git a/indexer/drawing_rule_def.hpp b/indexer/drawing_rule_def.hpp index 3fbc1685fb..7b8fdf7797 100644 --- a/indexer/drawing_rule_def.hpp +++ b/indexer/drawing_rule_def.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../base/buffer_vector.hpp" +#include "base/buffer_vector.hpp" namespace drule diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp index 7ff88ae18e..64a3b7a8a8 100644 --- a/indexer/drawing_rules.cpp +++ b/indexer/drawing_rules.cpp @@ -1,19 +1,19 @@ -#include "../std/target_os.hpp" +#include "std/target_os.hpp" -#include "drawing_rules.hpp" -#include "scales.hpp" -#include "classificator.hpp" -#include "drules_include.hpp" +#include "indexer/drawing_rules.hpp" +#include "indexer/scales.hpp" +#include "indexer/classificator.hpp" +#include "indexer/drules_include.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../std/bind.hpp" -#include "../std/iterator_facade.hpp" +#include "std/bind.hpp" +#include "std/iterator_facade.hpp" -#include "../platform/platform.hpp" -#include "../platform/settings.hpp" +#include "platform/platform.hpp" +#include "platform/settings.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" #include <google/protobuf/text_format.h> diff --git a/indexer/drawing_rules.hpp b/indexer/drawing_rules.hpp index 06d06a56c4..c323294054 100644 --- a/indexer/drawing_rules.hpp +++ b/indexer/drawing_rules.hpp @@ -1,17 +1,17 @@ #pragma once -#include "drawing_rule_def.hpp" +#include "indexer/drawing_rule_def.hpp" -#include "map_style.hpp" +#include "indexer/map_style.hpp" -#include "../base/base.hpp" -#include "../base/buffer_vector.hpp" +#include "base/base.hpp" +#include "base/buffer_vector.hpp" -#include "../std/map.hpp" -#include "../std/vector.hpp" -#include "../std/array.hpp" -#include "../std/string.hpp" -#include "../std/iostream.hpp" -#include "../std/target_os.hpp" +#include "std/map.hpp" +#include "std/vector.hpp" +#include "std/array.hpp" +#include "std/string.hpp" +#include "std/iostream.hpp" +#include "std/target_os.hpp" class LineDefProto; diff --git a/indexer/drules_include.hpp b/indexer/drules_include.hpp index 6211564b41..c42b51f334 100644 --- a/indexer/drules_include.hpp +++ b/indexer/drules_include.hpp @@ -1,5 +1,5 @@ #pragma once -#include "../std/target_os.hpp" +#include "std/target_os.hpp" -#include "drules_struct.pb.h" +#include "indexer/drules_struct.pb.h" diff --git a/indexer/feature.cpp b/indexer/feature.cpp index 9ddf065588..492da3735f 100644 --- a/indexer/feature.cpp +++ b/indexer/feature.cpp @@ -1,12 +1,12 @@ -#include "feature.hpp" -#include "feature_visibility.hpp" -#include "feature_loader_base.hpp" -#include "classificator.hpp" +#include "indexer/feature.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/feature_loader_base.hpp" +#include "indexer/classificator.hpp" -#include "../geometry/distance.hpp" -#include "../geometry/robust_orientation.hpp" +#include "geometry/distance.hpp" +#include "geometry/robust_orientation.hpp" -#include "../platform/preferred_languages.hpp" +#include "platform/preferred_languages.hpp" #include "../defines.hpp" // just for file extensions diff --git a/indexer/feature.hpp b/indexer/feature.hpp index 999d5f3f83..9e1a81884f 100644 --- a/indexer/feature.hpp +++ b/indexer/feature.hpp @@ -1,13 +1,13 @@ #pragma once -#include "cell_id.hpp" -#include "feature_data.hpp" +#include "indexer/cell_id.hpp" +#include "indexer/feature_data.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 feature diff --git a/indexer/feature_algo.cpp b/indexer/feature_algo.cpp index 1986f1d14d..ee13427d6f 100644 --- a/indexer/feature_algo.cpp +++ b/indexer/feature_algo.cpp @@ -1,7 +1,7 @@ -#include "feature_algo.hpp" -#include "feature.hpp" +#include "indexer/feature_algo.hpp" +#include "indexer/feature.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" namespace feature diff --git a/indexer/feature_algo.hpp b/indexer/feature_algo.hpp index d7d5b88e2d..e0a997097d 100644 --- a/indexer/feature_algo.hpp +++ b/indexer/feature_algo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" class FeatureType; diff --git a/indexer/feature_covering.cpp b/indexer/feature_covering.cpp index e5ebc49dbf..e153818b4f 100644 --- a/indexer/feature_covering.cpp +++ b/indexer/feature_covering.cpp @@ -1,12 +1,12 @@ -#include "feature_covering.hpp" -#include "cell_coverer.hpp" -#include "cell_id.hpp" -#include "feature.hpp" -#include "scales.hpp" +#include "indexer/feature_covering.hpp" +#include "indexer/cell_coverer.hpp" +#include "indexer/cell_id.hpp" +#include "indexer/feature.hpp" +#include "indexer/scales.hpp" -#include "../geometry/covering_utils.hpp" +#include "geometry/covering_utils.hpp" -#include "../std/vector.hpp" +#include "std/vector.hpp" namespace diff --git a/indexer/feature_covering.hpp b/indexer/feature_covering.hpp index d8abea2954..e7700e757f 100644 --- a/indexer/feature_covering.hpp +++ b/indexer/feature_covering.hpp @@ -1,10 +1,10 @@ #pragma once -#include "point_to_int64.hpp" +#include "indexer/point_to_int64.hpp" -#include "../geometry/rect2d.hpp" +#include "geometry/rect2d.hpp" -#include "../std/utility.hpp" -#include "../std/vector.hpp" +#include "std/utility.hpp" +#include "std/vector.hpp" class FeatureType; diff --git a/indexer/feature_data.cpp b/indexer/feature_data.cpp index fa37b9bcba..c5b3204f8c 100644 --- a/indexer/feature_data.cpp +++ b/indexer/feature_data.cpp @@ -1,11 +1,11 @@ -#include "feature_data.hpp" -#include "feature_impl.hpp" -#include "classificator.hpp" -#include "feature.hpp" +#include "indexer/feature_data.hpp" +#include "indexer/feature_impl.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature.hpp" -#include "../base/stl_add.hpp" +#include "base/stl_add.hpp" -#include "../std/bind.hpp" +#include "std/bind.hpp" using namespace feature; diff --git a/indexer/feature_data.hpp b/indexer/feature_data.hpp index 56dce9a9f1..fdaf0d69ce 100644 --- a/indexer/feature_data.hpp +++ b/indexer/feature_data.hpp @@ -1,17 +1,17 @@ #pragma once -#include "feature_decl.hpp" +#include "indexer/feature_decl.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../coding/multilang_utf8_string.hpp" -#include "../coding/value_opt_string.hpp" -#include "../coding/reader.hpp" +#include "coding/multilang_utf8_string.hpp" +#include "coding/value_opt_string.hpp" +#include "coding/reader.hpp" -#include "../std/string.hpp" -#include "../std/vector.hpp" -#include "../std/algorithm.hpp" +#include "std/string.hpp" +#include "std/vector.hpp" +#include "std/algorithm.hpp" -#include "feature_meta.hpp" +#include "indexer/feature_meta.hpp" class FeatureBase; diff --git a/indexer/feature_decl.cpp b/indexer/feature_decl.cpp index 69ccfcaaab..93616e8e51 100644 --- a/indexer/feature_decl.cpp +++ b/indexer/feature_decl.cpp @@ -1,6 +1,6 @@ -#include "feature_decl.hpp" +#include "indexer/feature_decl.hpp" -#include "../std/sstream.hpp" +#include "std/sstream.hpp" string DebugPrint(FeatureID const & id) diff --git a/indexer/feature_decl.hpp b/indexer/feature_decl.hpp index e5d88205fd..af8fdd57e1 100644 --- a/indexer/feature_decl.hpp +++ b/indexer/feature_decl.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../std/stdint.hpp" -#include "../std/string.hpp" +#include "std/stdint.hpp" +#include "std/string.hpp" namespace feature diff --git a/indexer/feature_impl.cpp b/indexer/feature_impl.cpp index 54d1719453..2ae4979a82 100644 --- a/indexer/feature_impl.cpp +++ b/indexer/feature_impl.cpp @@ -1,7 +1,7 @@ -#include "feature_impl.hpp" +#include "indexer/feature_impl.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" namespace feature diff --git a/indexer/feature_impl.hpp b/indexer/feature_impl.hpp index a4b83b86f2..72757633ff 100644 --- a/indexer/feature_impl.hpp +++ b/indexer/feature_impl.hpp @@ -1,10 +1,10 @@ #pragma once -#include "../base/macros.hpp" -#include "../base/assert.hpp" +#include "base/macros.hpp" +#include "base/assert.hpp" -#include "../std/string.hpp" -#include "../std/cstring.hpp" +#include "std/string.hpp" +#include "std/cstring.hpp" namespace strings { class UniString; } diff --git a/indexer/feature_loader.cpp b/indexer/feature_loader.cpp index 308792a97f..579324f09f 100644 --- a/indexer/feature_loader.cpp +++ b/indexer/feature_loader.cpp @@ -1,18 +1,18 @@ -#include "../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "feature_loader.hpp" -#include "feature.hpp" -#include "scales.hpp" -#include "geometry_serialization.hpp" -#include "classificator.hpp" +#include "indexer/feature_loader.hpp" +#include "indexer/feature.hpp" +#include "indexer/scales.hpp" +#include "indexer/geometry_serialization.hpp" +#include "indexer/classificator.hpp" -#include "../geometry/pointu_to_uint64.hpp" +#include "geometry/pointu_to_uint64.hpp" -#include "../coding/byte_stream.hpp" -#include "../coding/dd_vector.hpp" +#include "coding/byte_stream.hpp" +#include "coding/dd_vector.hpp" -#include "../base/logging.hpp" -#include "../defines.hpp" +#include "base/logging.hpp" +#include "defines.hpp" namespace feature { diff --git a/indexer/feature_loader.hpp b/indexer/feature_loader.hpp index b2b00deca2..693cb9a451 100644 --- a/indexer/feature_loader.hpp +++ b/indexer/feature_loader.hpp @@ -1,5 +1,5 @@ #pragma once -#include "feature_loader_base.hpp" +#include "indexer/feature_loader_base.hpp" namespace feature diff --git a/indexer/feature_loader_base.cpp b/indexer/feature_loader_base.cpp index 963eab0e5d..b769199502 100644 --- a/indexer/feature_loader_base.cpp +++ b/indexer/feature_loader_base.cpp @@ -1,14 +1,14 @@ -#include "../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "feature_loader_base.hpp" -#include "feature_loader.hpp" -#include "feature_impl.hpp" +#include "indexer/feature_loader_base.hpp" +#include "indexer/feature_loader.hpp" +#include "indexer/feature_impl.hpp" -#include "old/feature_loader_101.hpp" +#include "indexer/old/feature_loader_101.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../coding/byte_stream.hpp" +#include "coding/byte_stream.hpp" namespace feature diff --git a/indexer/feature_loader_base.hpp b/indexer/feature_loader_base.hpp index 409d3e0e27..4fa2fc5c60 100644 --- a/indexer/feature_loader_base.hpp +++ b/indexer/feature_loader_base.hpp @@ -1,10 +1,10 @@ #pragma once -#include "coding_params.hpp" -#include "data_header.hpp" +#include "indexer/coding_params.hpp" +#include "indexer/data_header.hpp" -#include "../coding/file_container.hpp" +#include "coding/file_container.hpp" -#include "../std/noncopyable.hpp" +#include "std/noncopyable.hpp" class FeatureType; diff --git a/indexer/feature_meta.cpp b/indexer/feature_meta.cpp index 5897638c50..5b86dee054 100644 --- a/indexer/feature_meta.cpp +++ b/indexer/feature_meta.cpp @@ -1 +1 @@ -#include "feature_meta.hpp" +#include "indexer/feature_meta.hpp" diff --git a/indexer/feature_meta.hpp b/indexer/feature_meta.hpp index 8d1fb5dce4..56fe190970 100644 --- a/indexer/feature_meta.hpp +++ b/indexer/feature_meta.hpp @@ -1,13 +1,13 @@ #pragma once -#include "../coding/reader.hpp" -#include "../coding/multilang_utf8_string.hpp" +#include "coding/reader.hpp" +#include "coding/multilang_utf8_string.hpp" -#include "../std/map.hpp" -#include "../std/string.hpp" -#include "../std/limits.hpp" -#include "../std/algorithm.hpp" -#include "../std/vector.hpp" +#include "std/map.hpp" +#include "std/string.hpp" +#include "std/limits.hpp" +#include "std/algorithm.hpp" +#include "std/vector.hpp" namespace feature { diff --git a/indexer/feature_processor.hpp b/indexer/feature_processor.hpp index 00ad6f503e..04590d6b7c 100644 --- a/indexer/feature_processor.hpp +++ b/indexer/feature_processor.hpp @@ -1,14 +1,14 @@ #pragma once -#include "data_header.hpp" -#include "features_vector.hpp" +#include "indexer/data_header.hpp" +#include "indexer/features_vector.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../coding/file_reader.hpp" -#include "../coding/file_container.hpp" +#include "coding/file_reader.hpp" +#include "coding/file_container.hpp" -#include "../std/bind.hpp" +#include "std/bind.hpp" namespace feature diff --git a/indexer/feature_utils.cpp b/indexer/feature_utils.cpp index 632c214767..7f33492efa 100644 --- a/indexer/feature_utils.cpp +++ b/indexer/feature_utils.cpp @@ -1,14 +1,14 @@ -#include "feature_utils.hpp" -#include "feature_visibility.hpp" -#include "classificator.hpp" -#include "feature_data.hpp" -#include "scales.hpp" +#include "indexer/feature_utils.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature_data.hpp" +#include "indexer/scales.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../base/base.hpp" +#include "base/base.hpp" -#include "../std/vector.hpp" +#include "std/vector.hpp" namespace feature diff --git a/indexer/feature_utils.hpp b/indexer/feature_utils.hpp index ab4ddc1c58..faa721fdd0 100644 --- a/indexer/feature_utils.hpp +++ b/indexer/feature_utils.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../geometry/rect2d.hpp" +#include "geometry/rect2d.hpp" -#include "../base/base.hpp" +#include "base/base.hpp" namespace feature diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp index 2c431ff38c..7d0c89e2ec 100644 --- a/indexer/feature_visibility.cpp +++ b/indexer/feature_visibility.cpp @@ -1,11 +1,11 @@ -#include "feature_visibility.hpp" -#include "classificator.hpp" -#include "feature.hpp" -#include "scales.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature.hpp" +#include "indexer/scales.hpp" -#include "../base/assert.hpp" +#include "base/assert.hpp" -#include "../std/array.hpp" +#include "std/array.hpp" namespace diff --git a/indexer/feature_visibility.hpp b/indexer/feature_visibility.hpp index 266896f254..7d48d5c96d 100644 --- a/indexer/feature_visibility.hpp +++ b/indexer/feature_visibility.hpp @@ -1,14 +1,14 @@ #pragma once -#include "drawing_rule_def.hpp" -#include "feature_decl.hpp" +#include "indexer/drawing_rule_def.hpp" +#include "indexer/feature_decl.hpp" -#include "../base/base.hpp" +#include "base/base.hpp" -#include "../std/vector.hpp" -#include "../std/string.hpp" -#include "../std/utility.hpp" -#include "../std/initializer_list.hpp" +#include "std/vector.hpp" +#include "std/string.hpp" +#include "std/utility.hpp" +#include "std/initializer_list.hpp" class FeatureBase; diff --git a/indexer/features_offsets_table.cpp b/indexer/features_offsets_table.cpp index 6e76cc069f..f75811e397 100644 --- a/indexer/features_offsets_table.cpp +++ b/indexer/features_offsets_table.cpp @@ -1,14 +1,14 @@ -#include "features_offsets_table.hpp" - -#include "../indexer/data_header.hpp" -#include "../indexer/features_vector.hpp" -#include "../coding/file_writer.hpp" -#include "../coding/internal/file_data.hpp" -#include "../platform/platform.hpp" -#include "../base/assert.hpp" -#include "../base/logging.hpp" -#include "../base/scope_guard.hpp" -#include "../std/string.hpp" +#include "indexer/features_offsets_table.hpp" + +#include "indexer/data_header.hpp" +#include "indexer/features_vector.hpp" +#include "coding/file_writer.hpp" +#include "coding/internal/file_data.hpp" +#include "platform/platform.hpp" +#include "base/assert.hpp" +#include "base/logging.hpp" +#include "base/scope_guard.hpp" +#include "std/string.hpp" namespace feature diff --git a/indexer/features_offsets_table.hpp b/indexer/features_offsets_table.hpp index d92a840ef7..060fdb3b93 100644 --- a/indexer/features_offsets_table.hpp +++ b/indexer/features_offsets_table.hpp @@ -1,13 +1,13 @@ #pragma once -#include "../coding/file_container.hpp" -#include "../coding/mmap_reader.hpp" -#include "../defines.hpp" -#include "../std/stdint.hpp" -#include "../std/unique_ptr.hpp" -#include "../std/vector.hpp" -#include "../3party/succinct/elias_fano.hpp" -#include "../3party/succinct/mapper.hpp" +#include "coding/file_container.hpp" +#include "coding/mmap_reader.hpp" +#include "defines.hpp" +#include "std/stdint.hpp" +#include "std/unique_ptr.hpp" +#include "std/vector.hpp" +#include "3party/succinct/elias_fano.hpp" +#include "3party/succinct/mapper.hpp" namespace feature { diff --git a/indexer/features_vector.hpp b/indexer/features_vector.hpp index 2cdf92f6fe..665e7de98c 100644 --- a/indexer/features_vector.hpp +++ b/indexer/features_vector.hpp @@ -1,8 +1,8 @@ #pragma once -#include "feature.hpp" -#include "feature_loader_base.hpp" +#include "indexer/feature.hpp" +#include "indexer/feature_loader_base.hpp" -#include "../coding/var_record_reader.hpp" +#include "coding/var_record_reader.hpp" /// Note! This class is NOT Thread-Safe. diff --git a/indexer/ftypes_matcher.cpp b/indexer/ftypes_matcher.cpp index 704a02780b..414a52f3de 100644 --- a/indexer/ftypes_matcher.cpp +++ b/indexer/ftypes_matcher.cpp @@ -1,8 +1,8 @@ -#include "ftypes_matcher.hpp" +#include "indexer/ftypes_matcher.hpp" -#include "../indexer/feature.hpp" -#include "../indexer/feature_data.hpp" -#include "../indexer/classificator.hpp" +#include "indexer/feature.hpp" +#include "indexer/feature_data.hpp" +#include "indexer/classificator.hpp" namespace ftypes diff --git a/indexer/ftypes_matcher.hpp b/indexer/ftypes_matcher.hpp index df194d3b46..2346e2dc68 100644 --- a/indexer/ftypes_matcher.hpp +++ b/indexer/ftypes_matcher.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../base/base.hpp" +#include "base/base.hpp" -#include "../std/vector.hpp" -#include "../std/string.hpp" +#include "std/vector.hpp" +#include "std/string.hpp" namespace feature { class TypesHolder; } class FeatureType; diff --git a/indexer/geometry_coding.cpp b/indexer/geometry_coding.cpp index ea14d863a0..f3d68172c5 100644 --- a/indexer/geometry_coding.cpp +++ b/indexer/geometry_coding.cpp @@ -1,10 +1,10 @@ -#include "geometry_coding.hpp" +#include "indexer/geometry_coding.hpp" -#include "../base/assert.hpp" -#include "../base/stl_add.hpp" +#include "base/assert.hpp" +#include "base/stl_add.hpp" -#include "../std/complex.hpp" -#include "../std/vector.hpp" +#include "std/complex.hpp" +#include "std/vector.hpp" namespace diff --git a/indexer/geometry_coding.hpp b/indexer/geometry_coding.hpp index 57be2dc774..645938d205 100644 --- a/indexer/geometry_coding.hpp +++ b/indexer/geometry_coding.hpp @@ -1,12 +1,12 @@ #pragma once -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../coding/varint.hpp" +#include "coding/varint.hpp" -#include "../base/base.hpp" -#include "../base/bits.hpp" -#include "../base/array_adapters.hpp" +#include "base/base.hpp" +#include "base/bits.hpp" +#include "base/array_adapters.hpp" //@{ inline uint64_t EncodeDelta(m2::PointU const & actual, m2::PointU const & prediction) diff --git a/indexer/geometry_serialization.cpp b/indexer/geometry_serialization.cpp index f43ba6a746..941f60e94a 100644 --- a/indexer/geometry_serialization.cpp +++ b/indexer/geometry_serialization.cpp @@ -1,14 +1,14 @@ -#include "geometry_serialization.hpp" -#include "mercator.hpp" -#include "point_to_int64.hpp" -#include "geometry_coding.hpp" +#include "indexer/geometry_serialization.hpp" +#include "indexer/mercator.hpp" +#include "indexer/point_to_int64.hpp" +#include "indexer/geometry_coding.hpp" -#include "../geometry/pointu_to_uint64.hpp" +#include "geometry/pointu_to_uint64.hpp" -#include "../std/algorithm.hpp" -#include "../std/bind.hpp" -#include "../std/iterator.hpp" -#include "../std/stack.hpp" +#include "std/algorithm.hpp" +#include "std/bind.hpp" +#include "std/iterator.hpp" +#include "std/stack.hpp" namespace serial diff --git a/indexer/geometry_serialization.hpp b/indexer/geometry_serialization.hpp index bd0662844e..fea5e02da1 100644 --- a/indexer/geometry_serialization.hpp +++ b/indexer/geometry_serialization.hpp @@ -1,21 +1,21 @@ #pragma once -#include "geometry_coding.hpp" -#include "tesselator_decl.hpp" -#include "point_to_int64.hpp" -#include "coding_params.hpp" +#include "indexer/geometry_coding.hpp" +#include "indexer/tesselator_decl.hpp" +#include "indexer/point_to_int64.hpp" +#include "indexer/coding_params.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/point2d.hpp" -#include "../coding/reader.hpp" -#include "../coding/writer.hpp" -#include "../coding/varint.hpp" +#include "coding/reader.hpp" +#include "coding/writer.hpp" +#include "coding/varint.hpp" -#include "../std/algorithm.hpp" -#include "../std/bind.hpp" +#include "std/algorithm.hpp" +#include "std/bind.hpp" -#include "../base/buffer_vector.hpp" -#include "../base/stl_add.hpp" +#include "base/buffer_vector.hpp" +#include "base/stl_add.hpp" namespace serial diff --git a/indexer/index.cpp b/indexer/index.cpp index db15ffcb29..028fef2d6a 100644 --- a/indexer/index.cpp +++ b/indexer/index.cpp @@ -1,11 +1,10 @@ -#include "index.hpp" +#include "indexer/index.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../base/logging.hpp" - -#include "../coding/file_name_utils.hpp" -#include "../coding/internal/file_data.hpp" +#include "base/logging.hpp" +#include "coding/file_name_utils.hpp" +#include "coding/internal/file_data.hpp" ////////////////////////////////////////////////////////////////////////////////// diff --git a/indexer/index.hpp b/indexer/index.hpp index 0b13c4fc4c..d776ab09e9 100644 --- a/indexer/index.hpp +++ b/indexer/index.hpp @@ -1,22 +1,22 @@ #pragma once -#include "cell_id.hpp" -#include "data_factory.hpp" -#include "feature_covering.hpp" -#include "features_vector.hpp" -#include "mwm_set.hpp" -#include "scale_index.hpp" +#include "indexer/cell_id.hpp" +#include "indexer/data_factory.hpp" +#include "indexer/feature_covering.hpp" +#include "indexer/features_vector.hpp" +#include "indexer/mwm_set.hpp" +#include "indexer/scale_index.hpp" -#include "../coding/file_container.hpp" +#include "coding/file_container.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../base/macros.hpp" -#include "../base/observer_list.hpp" +#include "base/macros.hpp" +#include "base/observer_list.hpp" -#include "../std/algorithm.hpp" -#include "../std/unordered_set.hpp" -#include "../std/utility.hpp" -#include "../std/vector.hpp" +#include "std/algorithm.hpp" +#include "std/unordered_set.hpp" +#include "std/utility.hpp" +#include "std/vector.hpp" class MwmValue : public MwmSet::MwmValueBase { diff --git a/indexer/index_builder.cpp b/indexer/index_builder.cpp index 33a1d2191c..8ce7b19e6f 100644 --- a/indexer/index_builder.cpp +++ b/indexer/index_builder.cpp @@ -1,9 +1,9 @@ -#include "index_builder.hpp" -#include "features_vector.hpp" +#include "indexer/index_builder.hpp" +#include "indexer/features_vector.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../base/logging.hpp" +#include "base/logging.hpp" namespace indexer diff --git a/indexer/index_builder.hpp b/indexer/index_builder.hpp index edd9e5c45d..264576a9a8 100644 --- a/indexer/index_builder.hpp +++ b/indexer/index_builder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "scale_index_builder.hpp" +#include "indexer/scale_index_builder.hpp" namespace indexer { diff --git a/indexer/indexer_tests/categories_test.cpp b/indexer/indexer_tests/categories_test.cpp index 9b9847a1a2..e61b3a446f 100644 --- a/indexer/indexer_tests/categories_test.cpp +++ b/indexer/indexer_tests/categories_test.cpp @@ -1,13 +1,13 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../categories_holder.hpp" +#include "indexer/categories_holder.hpp" -#include "../../indexer/classificator.hpp" -#include "../../indexer/classificator_loader.hpp" +#include "indexer/classificator.hpp" +#include "indexer/classificator_loader.hpp" -#include "../../coding/multilang_utf8_string.hpp" +#include "coding/multilang_utf8_string.hpp" -#include "../../std/sstream.hpp" +#include "std/sstream.hpp" char const * TEST_STRING = "amenity-bench\n" diff --git a/indexer/indexer_tests/cell_coverer_test.cpp b/indexer/indexer_tests/cell_coverer_test.cpp index fb9370220a..6451a0cd5a 100644 --- a/indexer/indexer_tests/cell_coverer_test.cpp +++ b/indexer/indexer_tests/cell_coverer_test.cpp @@ -1,9 +1,9 @@ -#include "../cell_coverer.hpp" -#include "../../testing/testing.hpp" +#include "indexer/cell_coverer.hpp" +#include "testing/testing.hpp" -#include "../../geometry/covering_utils.hpp" -#include "../../coding/hex.hpp" -#include "../../base/logging.hpp" +#include "geometry/covering_utils.hpp" +#include "coding/hex.hpp" +#include "base/logging.hpp" // Unit test uses m2::CellId<30> for historical reasons, the actual production code uses RectId. typedef m2::CellId<30> CellIdT; diff --git a/indexer/indexer_tests/cell_id_test.cpp b/indexer/indexer_tests/cell_id_test.cpp index 8d609b33c7..90fb16990b 100644 --- a/indexer/indexer_tests/cell_id_test.cpp +++ b/indexer/indexer_tests/cell_id_test.cpp @@ -1,10 +1,10 @@ -#include "../cell_id.hpp" -#include "../../testing/testing.hpp" -#include "../../coding/hex.hpp" -#include "../../base/pseudo_random.hpp" -#include "../../std/cmath.hpp" -#include "../../std/string.hpp" -#include "../../std/cmath.hpp" +#include "indexer/cell_id.hpp" +#include "testing/testing.hpp" +#include "coding/hex.hpp" +#include "base/pseudo_random.hpp" +#include "std/cmath.hpp" +#include "std/string.hpp" +#include "std/cmath.hpp" typedef m2::CellId<30> CellIdT; diff --git a/indexer/indexer_tests/checker_test.cpp b/indexer/indexer_tests/checker_test.cpp index 7d3ceb886e..e5417fa92f 100644 --- a/indexer/indexer_tests/checker_test.cpp +++ b/indexer/indexer_tests/checker_test.cpp @@ -1,11 +1,11 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../ftypes_matcher.hpp" +#include "indexer/ftypes_matcher.hpp" -#include "../../indexer/index.hpp" -#include "../../indexer/classificator.hpp" +#include "indexer/index.hpp" +#include "indexer/classificator.hpp" -#include "../../base/logging.hpp" +#include "base/logging.hpp" namespace { diff --git a/indexer/indexer_tests/features_offsets_table_test.cpp b/indexer/indexer_tests/features_offsets_table_test.cpp index 9c1679fed5..07e04b9b0e 100644 --- a/indexer/indexer_tests/features_offsets_table_test.cpp +++ b/indexer/indexer_tests/features_offsets_table_test.cpp @@ -1,15 +1,15 @@ -#include "../../testing/testing.hpp" - -#include "../features_offsets_table.hpp" -#include "../data_header.hpp" -#include "../features_vector.hpp" - -#include "../../platform/platform.hpp" -#include "../../coding/file_container.hpp" -#include "../../base/scope_guard.hpp" -#include "../../std/bind.hpp" -#include "../../std/string.hpp" -#include "../../defines.hpp" +#include "testing/testing.hpp" + +#include "indexer/features_offsets_table.hpp" +#include "indexer/data_header.hpp" +#include "indexer/features_vector.hpp" + +#include "platform/platform.hpp" +#include "coding/file_container.hpp" +#include "base/scope_guard.hpp" +#include "std/bind.hpp" +#include "std/string.hpp" +#include "defines.hpp" namespace feature { diff --git a/indexer/indexer_tests/geometry_coding_test.cpp b/indexer/indexer_tests/geometry_coding_test.cpp index c3b9a49535..fb7867b76b 100644 --- a/indexer/indexer_tests/geometry_coding_test.cpp +++ b/indexer/indexer_tests/geometry_coding_test.cpp @@ -1,21 +1,21 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../geometry_coding.hpp" -#include "../point_to_int64.hpp" -#include "../mercator.hpp" -#include "../coding_params.hpp" +#include "indexer/geometry_coding.hpp" +#include "indexer/point_to_int64.hpp" +#include "indexer/mercator.hpp" +#include "indexer/coding_params.hpp" -#include "test_polylines.hpp" +#include "indexer/indexer_tests/test_polylines.hpp" -#include "../../geometry/geometry_tests/large_polygon.hpp" -#include "../../geometry/distance.hpp" -#include "../../geometry/simplification.hpp" +#include "geometry/geometry_tests/large_polygon.hpp" +#include "geometry/distance.hpp" +#include "geometry/simplification.hpp" -#include "../../coding/byte_stream.hpp" -#include "../../coding/varint.hpp" -#include "../../coding/writer.hpp" +#include "coding/byte_stream.hpp" +#include "coding/varint.hpp" +#include "coding/writer.hpp" -#include "../../base/logging.hpp" +#include "base/logging.hpp" typedef m2::PointU PU; diff --git a/indexer/indexer_tests/geometry_serialization_test.cpp b/indexer/indexer_tests/geometry_serialization_test.cpp index 881e814f0b..d40b1d111b 100644 --- a/indexer/indexer_tests/geometry_serialization_test.cpp +++ b/indexer/indexer_tests/geometry_serialization_test.cpp @@ -1,15 +1,15 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "test_polylines.hpp" +#include "indexer/indexer_tests/test_polylines.hpp" -#include "../geometry_serialization.hpp" -#include "../coding_params.hpp" -#include "../mercator.hpp" +#include "indexer/geometry_serialization.hpp" +#include "indexer/coding_params.hpp" +#include "indexer/mercator.hpp" -#include "../../coding/reader.hpp" -#include "../../coding/byte_stream.hpp" +#include "coding/reader.hpp" +#include "coding/byte_stream.hpp" -#include "../../base/logging.hpp" +#include "base/logging.hpp" // Copy-Paste from feature_builder.cpp diff --git a/indexer/indexer_tests/index_builder_test.cpp b/indexer/indexer_tests/index_builder_test.cpp index 500621e51f..4bfb683476 100644 --- a/indexer/indexer_tests/index_builder_test.cpp +++ b/indexer/indexer_tests/index_builder_test.cpp @@ -1,19 +1,19 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../index.hpp" -#include "../index_builder.hpp" -#include "../classificator_loader.hpp" -#include "../features_vector.hpp" -#include "../scales.hpp" +#include "indexer/index.hpp" +#include "indexer/index_builder.hpp" +#include "indexer/classificator_loader.hpp" +#include "indexer/features_vector.hpp" +#include "indexer/scales.hpp" -#include "../../defines.hpp" +#include "defines.hpp" -#include "../../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../../coding/file_container.hpp" +#include "coding/file_container.hpp" -#include "../../base/macros.hpp" -#include "../../base/stl_add.hpp" +#include "base/macros.hpp" +#include "base/stl_add.hpp" UNIT_TEST(BuildIndexTest) diff --git a/indexer/indexer_tests/index_test.cpp b/indexer/indexer_tests/index_test.cpp index 9ef9cfdb81..8b83b5fce2 100644 --- a/indexer/indexer_tests/index_test.cpp +++ b/indexer/indexer_tests/index_test.cpp @@ -1,20 +1,20 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../data_header.hpp" -#include "../index.hpp" +#include "indexer/data_header.hpp" +#include "indexer/index.hpp" -#include "../../coding/file_name_utils.hpp" -#include "../../coding/internal/file_data.hpp" +#include "coding/file_name_utils.hpp" +#include "coding/internal/file_data.hpp" -#include "../../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../../base/logging.hpp" -#include "../../base/macros.hpp" -#include "../../base/scope_guard.hpp" -#include "../../base/stl_add.hpp" +#include "base/logging.hpp" +#include "base/macros.hpp" +#include "base/scope_guard.hpp" +#include "base/stl_add.hpp" -#include "../../std/bind.hpp" -#include "../../std/string.hpp" +#include "std/bind.hpp" +#include "std/string.hpp" void CheckedDeleteFile(string const & file) { diff --git a/indexer/indexer_tests/interval_index_test.cpp b/indexer/indexer_tests/interval_index_test.cpp index 9842fbe361..a128187a45 100644 --- a/indexer/indexer_tests/interval_index_test.cpp +++ b/indexer/indexer_tests/interval_index_test.cpp @@ -1,12 +1,12 @@ -#include "../../testing/testing.hpp" -#include "../interval_index.hpp" -#include "../interval_index_builder.hpp" -#include "../../coding/reader.hpp" -#include "../../coding/writer.hpp" -#include "../../base/macros.hpp" -#include "../../base/stl_add.hpp" -#include "../../std/utility.hpp" -#include "../../std/vector.hpp" +#include "testing/testing.hpp" +#include "indexer/interval_index.hpp" +#include "indexer/interval_index_builder.hpp" +#include "coding/reader.hpp" +#include "coding/writer.hpp" +#include "base/macros.hpp" +#include "base/stl_add.hpp" +#include "std/utility.hpp" +#include "std/vector.hpp" namespace { diff --git a/indexer/indexer_tests/mercator_test.cpp b/indexer/indexer_tests/mercator_test.cpp index 3fa787247a..5c7c8fa931 100644 --- a/indexer/indexer_tests/mercator_test.cpp +++ b/indexer/indexer_tests/mercator_test.cpp @@ -1,12 +1,12 @@ -#include "../../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../../indexer/mercator.hpp" +#include "indexer/mercator.hpp" -#include "../../base/math.hpp" -#include "../../base/macros.hpp" -#include "../../base/logging.hpp" +#include "base/math.hpp" +#include "base/macros.hpp" +#include "base/logging.hpp" UNIT_TEST(Mercator_Grid) diff --git a/indexer/indexer_tests/mwm_set_test.cpp b/indexer/indexer_tests/mwm_set_test.cpp index 90f05268b7..c93da15009 100644 --- a/indexer/indexer_tests/mwm_set_test.cpp +++ b/indexer/indexer_tests/mwm_set_test.cpp @@ -1,8 +1,8 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../mwm_set.hpp" +#include "indexer/mwm_set.hpp" -#include "../../base/macros.hpp" +#include "base/macros.hpp" namespace { diff --git a/indexer/indexer_tests/point_to_int64_test.cpp b/indexer/indexer_tests/point_to_int64_test.cpp index 2240dfd56a..84bf3ce544 100644 --- a/indexer/indexer_tests/point_to_int64_test.cpp +++ b/indexer/indexer_tests/point_to_int64_test.cpp @@ -1,13 +1,13 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "test_polylines.hpp" +#include "indexer/indexer_tests/test_polylines.hpp" -#include "../cell_id.hpp" +#include "indexer/cell_id.hpp" -#include "../../base/logging.hpp" +#include "base/logging.hpp" -#include "../../std/cmath.hpp" -#include "../../std/utility.hpp" +#include "std/cmath.hpp" +#include "std/utility.hpp" namespace diff --git a/indexer/indexer_tests/scales_test.cpp b/indexer/indexer_tests/scales_test.cpp index 2a1778c465..05f5e652dd 100644 --- a/indexer/indexer_tests/scales_test.cpp +++ b/indexer/indexer_tests/scales_test.cpp @@ -1,5 +1,5 @@ -#include "../../testing/testing.hpp" -#include "../scales.hpp" +#include "testing/testing.hpp" +#include "indexer/scales.hpp" using namespace scales; diff --git a/indexer/indexer_tests/sort_and_merge_intervals_test.cpp b/indexer/indexer_tests/sort_and_merge_intervals_test.cpp index 9cc597a45b..b8eefab292 100644 --- a/indexer/indexer_tests/sort_and_merge_intervals_test.cpp +++ b/indexer/indexer_tests/sort_and_merge_intervals_test.cpp @@ -1,5 +1,5 @@ -#include "../../testing/testing.hpp" -#include "../feature_covering.hpp" +#include "testing/testing.hpp" +#include "indexer/feature_covering.hpp" UNIT_TEST(SortAndMergeIntervals_1Interval) { diff --git a/indexer/indexer_tests/test_polylines.cpp b/indexer/indexer_tests/test_polylines.cpp index ed64a82693..357553b178 100644 --- a/indexer/indexer_tests/test_polylines.cpp +++ b/indexer/indexer_tests/test_polylines.cpp @@ -1,4 +1,4 @@ -#include "test_polylines.hpp" +#include "indexer/indexer_tests/test_polylines.hpp" namespace index_test { diff --git a/indexer/indexer_tests/test_type.cpp b/indexer/indexer_tests/test_type.cpp index 33df7d34a0..04b704de01 100644 --- a/indexer/indexer_tests/test_type.cpp +++ b/indexer/indexer_tests/test_type.cpp @@ -1,8 +1,8 @@ -#include "../../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../classificator.hpp" +#include "indexer/classificator.hpp" namespace { diff --git a/indexer/indexer_tests/visibility_test.cpp b/indexer/indexer_tests/visibility_test.cpp index a34e4a487a..defc2f2165 100644 --- a/indexer/indexer_tests/visibility_test.cpp +++ b/indexer/indexer_tests/visibility_test.cpp @@ -1,12 +1,12 @@ -#include "../../testing/testing.hpp" +#include "testing/testing.hpp" -#include "../feature_data.hpp" -#include "../feature_visibility.hpp" -#include "../classificator.hpp" -#include "../classificator_loader.hpp" -#include "../scales.hpp" +#include "indexer/feature_data.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/classificator.hpp" +#include "indexer/classificator_loader.hpp" +#include "indexer/scales.hpp" -#include "../../base/logging.hpp" +#include "base/logging.hpp" UNIT_TEST(VisibleScales_Smoke) diff --git a/indexer/interval_index.hpp b/indexer/interval_index.hpp index 6dffd25ef8..ab83cdc49c 100644 --- a/indexer/interval_index.hpp +++ b/indexer/interval_index.hpp @@ -1,15 +1,15 @@ #pragma once -#include "interval_index_iface.hpp" +#include "indexer/interval_index_iface.hpp" -#include "../coding/endianness.hpp" -#include "../coding/byte_stream.hpp" -#include "../coding/reader.hpp" -#include "../coding/varint.hpp" +#include "coding/endianness.hpp" +#include "coding/byte_stream.hpp" +#include "coding/reader.hpp" +#include "coding/varint.hpp" -#include "../base/assert.hpp" -#include "../base/buffer_vector.hpp" +#include "base/assert.hpp" +#include "base/buffer_vector.hpp" -#include "../std/static_assert.hpp" +#include "std/static_assert.hpp" class IntervalIndexBase : public IntervalIndexIFace diff --git a/indexer/interval_index_builder.hpp b/indexer/interval_index_builder.hpp index 8a4fd571ca..e2498b1924 100644 --- a/indexer/interval_index_builder.hpp +++ b/indexer/interval_index_builder.hpp @@ -1,14 +1,14 @@ #pragma once -#include "interval_index.hpp" -#include "../coding/byte_stream.hpp" -#include "../coding/endianness.hpp" -#include "../coding/varint.hpp" -#include "../coding/write_to_sink.hpp" -#include "../base/assert.hpp" -#include "../base/base.hpp" -#include "../base/bits.hpp" -#include "../base/logging.hpp" -#include "../std/vector.hpp" +#include "indexer/interval_index.hpp" +#include "coding/byte_stream.hpp" +#include "coding/endianness.hpp" +#include "coding/varint.hpp" +#include "coding/write_to_sink.hpp" +#include "base/assert.hpp" +#include "base/base.hpp" +#include "base/bits.hpp" +#include "base/logging.hpp" +#include "std/vector.hpp" // +------------------------------+ // | Header | diff --git a/indexer/interval_index_iface.hpp b/indexer/interval_index_iface.hpp index ff24ec9dcd..94fea67205 100644 --- a/indexer/interval_index_iface.hpp +++ b/indexer/interval_index_iface.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../std/stdint.hpp" -#include "../std/function.hpp" +#include "std/stdint.hpp" +#include "std/function.hpp" class IntervalIndexIFace diff --git a/indexer/mercator.cpp b/indexer/mercator.cpp index 3f5bd9af8a..6ba8d77bbd 100644 --- a/indexer/mercator.cpp +++ b/indexer/mercator.cpp @@ -1,6 +1,6 @@ -#include "mercator.hpp" +#include "indexer/mercator.hpp" -#include "../geometry/distance_on_sphere.hpp" +#include "geometry/distance_on_sphere.hpp" double MercatorBounds::minX = -180; double MercatorBounds::maxX = 180; diff --git a/indexer/mercator.hpp b/indexer/mercator.hpp index 139efd24d2..767d63d3e2 100644 --- a/indexer/mercator.hpp +++ b/indexer/mercator.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../geometry/point2d.hpp" -#include "../geometry/rect2d.hpp" +#include "geometry/point2d.hpp" +#include "geometry/rect2d.hpp" -#include "../base/math.hpp" +#include "base/math.hpp" struct MercatorBounds diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp index baa5cf139d..a00251f148 100644 --- a/indexer/mwm_set.cpp +++ b/indexer/mwm_set.cpp @@ -1,13 +1,13 @@ -#include "mwm_set.hpp" -#include "scales.hpp" +#include "indexer/mwm_set.hpp" +#include "indexer/scales.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../base/assert.hpp" -#include "../base/logging.hpp" -#include "../base/stl_add.hpp" +#include "base/assert.hpp" +#include "base/logging.hpp" +#include "base/stl_add.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" // static MwmSet::MwmId const MwmSet::INVALID_MWM_ID = static_cast<MwmSet::MwmId>(-1); diff --git a/indexer/mwm_set.hpp b/indexer/mwm_set.hpp index c8c3d3b5a7..87ffc31063 100644 --- a/indexer/mwm_set.hpp +++ b/indexer/mwm_set.hpp @@ -1,16 +1,16 @@ #pragma once -#include "mwm_version.hpp" +#include "indexer/mwm_version.hpp" -#include "../geometry/rect2d.hpp" +#include "geometry/rect2d.hpp" -#include "../base/macros.hpp" +#include "base/macros.hpp" -#include "../std/deque.hpp" -#include "../std/mutex.hpp" -#include "../std/string.hpp" -#include "../std/utility.hpp" -#include "../std/vector.hpp" +#include "std/deque.hpp" +#include "std/mutex.hpp" +#include "std/string.hpp" +#include "std/utility.hpp" +#include "std/vector.hpp" /// Information about stored mwm. class MwmInfo diff --git a/indexer/mwm_version.cpp b/indexer/mwm_version.cpp index 130a6692ce..e1c4f29792 100644 --- a/indexer/mwm_version.cpp +++ b/indexer/mwm_version.cpp @@ -1,17 +1,17 @@ -#include "mwm_version.hpp" -#include "data_header.hpp" +#include "indexer/mwm_version.hpp" +#include "indexer/data_header.hpp" -#include "../coding/file_container.hpp" -#include "../coding/reader_wrapper.hpp" -#include "../coding/varint.hpp" -#include "../coding/writer.hpp" +#include "coding/file_container.hpp" +#include "coding/reader_wrapper.hpp" +#include "coding/varint.hpp" +#include "coding/writer.hpp" -#include "../base/logging.hpp" -#include "../base/timer.hpp" +#include "base/logging.hpp" +#include "base/timer.hpp" -#include "../defines.hpp" +#include "defines.hpp" -#include "../std/ctime.hpp" +#include "std/ctime.hpp" namespace version { diff --git a/indexer/mwm_version.hpp b/indexer/mwm_version.hpp index a05ce8f15e..075d5ab9c7 100644 --- a/indexer/mwm_version.hpp +++ b/indexer/mwm_version.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/stdint.hpp" +#include "std/stdint.hpp" class FilesContainerR; class ReaderSrc; diff --git a/indexer/old/feature_loader_101.cpp b/indexer/old/feature_loader_101.cpp index 2c365cd593..4b2219f158 100644 --- a/indexer/old/feature_loader_101.cpp +++ b/indexer/old/feature_loader_101.cpp @@ -1,14 +1,14 @@ -#include "../../base/SRC_FIRST.hpp" +#include "base/SRC_FIRST.hpp" -#include "feature_loader_101.hpp" +#include "indexer/old/feature_loader_101.hpp" -#include "../classificator.hpp" -#include "../feature.hpp" -#include "../scales.hpp" -#include "../geometry_serialization.hpp" -#include "../coding_params.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature.hpp" +#include "indexer/scales.hpp" +#include "indexer/geometry_serialization.hpp" +#include "indexer/coding_params.hpp" -#include "../../coding/byte_stream.hpp" +#include "coding/byte_stream.hpp" namespace old_101 { namespace feature { diff --git a/indexer/old/feature_loader_101.hpp b/indexer/old/feature_loader_101.hpp index e18dfb32b5..a18c8913da 100644 --- a/indexer/old/feature_loader_101.hpp +++ b/indexer/old/feature_loader_101.hpp @@ -1,5 +1,5 @@ #pragma once -#include "../feature_loader_base.hpp" +#include "indexer/feature_loader_base.hpp" namespace old_101 { namespace feature diff --git a/indexer/old/interval_index_101.hpp b/indexer/old/interval_index_101.hpp index 88175a94d0..82b40d6361 100644 --- a/indexer/old/interval_index_101.hpp +++ b/indexer/old/interval_index_101.hpp @@ -1,13 +1,13 @@ #pragma once -#include "../interval_index_iface.hpp" +#include "indexer/interval_index_iface.hpp" -#include "../../coding/endianness.hpp" +#include "coding/endianness.hpp" -#include "../../base/assert.hpp" -#include "../../base/base.hpp" -#include "../../base/macros.hpp" +#include "base/assert.hpp" +#include "base/base.hpp" +#include "base/macros.hpp" -#include "../../std/cstring.hpp" +#include "std/cstring.hpp" namespace old_101 { diff --git a/indexer/point_to_int64.cpp b/indexer/point_to_int64.cpp index 7b762b202a..2090b5a12f 100644 --- a/indexer/point_to_int64.cpp +++ b/indexer/point_to_int64.cpp @@ -1,10 +1,10 @@ -#include "cell_id.hpp" +#include "indexer/cell_id.hpp" -#include "../geometry/pointu_to_uint64.hpp" +#include "geometry/pointu_to_uint64.hpp" -#include "../base/bits.hpp" +#include "base/bits.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" namespace diff --git a/indexer/point_to_int64.hpp b/indexer/point_to_int64.hpp index 4a11007336..2e8eef3166 100644 --- a/indexer/point_to_int64.hpp +++ b/indexer/point_to_int64.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../geometry/cellid.hpp" -#include "../geometry/rect2d.hpp" +#include "geometry/cellid.hpp" +#include "geometry/rect2d.hpp" -#include "../std/utility.hpp" +#include "std/utility.hpp" #define POINT_COORD_BITS 30 diff --git a/indexer/scale_index.cpp b/indexer/scale_index.cpp index d6356d2dbc..a3c9195aad 100644 --- a/indexer/scale_index.cpp +++ b/indexer/scale_index.cpp @@ -1,4 +1,4 @@ -#include "scale_index.hpp" +#include "indexer/scale_index.hpp" /// Using default one to one mapping. diff --git a/indexer/scale_index.hpp b/indexer/scale_index.hpp index eadb0c9261..5f17a10685 100644 --- a/indexer/scale_index.hpp +++ b/indexer/scale_index.hpp @@ -1,14 +1,14 @@ #pragma once -#include "data_factory.hpp" -#include "interval_index_iface.hpp" +#include "indexer/data_factory.hpp" +#include "indexer/interval_index_iface.hpp" -#include "../coding/var_serial_vector.hpp" +#include "coding/var_serial_vector.hpp" -#include "../base/stl_add.hpp" +#include "base/stl_add.hpp" -#include "../std/algorithm.hpp" -#include "../std/bind.hpp" +#include "std/algorithm.hpp" +#include "std/bind.hpp" /// Index bucket <--> Draw scale range. diff --git a/indexer/scale_index_builder.hpp b/indexer/scale_index_builder.hpp index 9dd6258358..fe04d8f069 100644 --- a/indexer/scale_index_builder.hpp +++ b/indexer/scale_index_builder.hpp @@ -1,26 +1,26 @@ #pragma once -#include "scale_index.hpp" -#include "feature_covering.hpp" -#include "feature_visibility.hpp" -#include "feature.hpp" -#include "interval_index_builder.hpp" -#include "cell_id.hpp" - -#include "../defines.hpp" - -#include "../coding/dd_vector.hpp" -#include "../coding/file_sort.hpp" -#include "../coding/var_serial_vector.hpp" -#include "../coding/writer.hpp" - -#include "../base/base.hpp" -#include "../base/logging.hpp" -#include "../base/macros.hpp" - -#include "../std/string.hpp" -#include "../std/vector.hpp" -#include "../std/utility.hpp" -#include "../std/unordered_set.hpp" +#include "indexer/scale_index.hpp" +#include "indexer/feature_covering.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/feature.hpp" +#include "indexer/interval_index_builder.hpp" +#include "indexer/cell_id.hpp" + +#include "defines.hpp" + +#include "coding/dd_vector.hpp" +#include "coding/file_sort.hpp" +#include "coding/var_serial_vector.hpp" +#include "coding/writer.hpp" + +#include "base/base.hpp" +#include "base/logging.hpp" +#include "base/macros.hpp" + +#include "std/string.hpp" +#include "std/vector.hpp" +#include "std/utility.hpp" +#include "std/unordered_set.hpp" class CellFeaturePair diff --git a/indexer/scales.cpp b/indexer/scales.cpp index a1db3730b7..b91bda7902 100644 --- a/indexer/scales.cpp +++ b/indexer/scales.cpp @@ -1,9 +1,9 @@ -#include "scales.hpp" -#include "mercator.hpp" +#include "indexer/scales.hpp" +#include "indexer/mercator.hpp" -#include "../base/math.hpp" +#include "base/math.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" namespace scales diff --git a/indexer/scales.hpp b/indexer/scales.hpp index ad182af475..9fdebd8740 100644 --- a/indexer/scales.hpp +++ b/indexer/scales.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../geometry/rect2d.hpp" -#include "../geometry/point2d.hpp" +#include "geometry/rect2d.hpp" +#include "geometry/point2d.hpp" namespace scales diff --git a/indexer/search_delimiters.cpp b/indexer/search_delimiters.cpp index 237942dc5b..ff2d068415 100644 --- a/indexer/search_delimiters.cpp +++ b/indexer/search_delimiters.cpp @@ -1,4 +1,4 @@ -#include "search_delimiters.hpp" +#include "indexer/search_delimiters.hpp" namespace search { diff --git a/indexer/search_delimiters.hpp b/indexer/search_delimiters.hpp index 5153b53bc5..3d7bf1ee0e 100644 --- a/indexer/search_delimiters.hpp +++ b/indexer/search_delimiters.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../base/string_utils.hpp" +#include "base/string_utils.hpp" namespace search { diff --git a/indexer/search_index_builder.cpp b/indexer/search_index_builder.cpp index c62507513f..7c31318521 100644 --- a/indexer/search_index_builder.cpp +++ b/indexer/search_index_builder.cpp @@ -1,39 +1,39 @@ -#include "search_index_builder.hpp" -#include "feature_utils.hpp" -#include "features_vector.hpp" -#include "search_delimiters.hpp" -#include "search_trie.hpp" -#include "search_string_utils.hpp" -#include "string_file.hpp" -#include "string_file_values.hpp" -#include "classificator.hpp" -#include "feature_visibility.hpp" -#include "categories_holder.hpp" -#include "feature_algo.hpp" +#include "indexer/search_index_builder.hpp" +#include "indexer/feature_utils.hpp" +#include "indexer/features_vector.hpp" +#include "indexer/search_delimiters.hpp" +#include "indexer/search_trie.hpp" +#include "indexer/search_string_utils.hpp" +#include "indexer/string_file.hpp" +#include "indexer/string_file_values.hpp" +#include "indexer/classificator.hpp" +#include "indexer/feature_visibility.hpp" +#include "indexer/categories_holder.hpp" +#include "indexer/feature_algo.hpp" #include "../search/search_common.hpp" // for MAX_TOKENS constant -#include "../defines.hpp" +#include "defines.hpp" -#include "../platform/platform.hpp" +#include "platform/platform.hpp" -#include "../coding/trie_builder.hpp" -#include "../coding/writer.hpp" -#include "../coding/reader_writer_ops.hpp" +#include "coding/trie_builder.hpp" +#include "coding/writer.hpp" +#include "coding/reader_writer_ops.hpp" -#include "../base/assert.hpp" -#include "../base/timer.hpp" -#include "../base/scope_guard.hpp" -#include "../base/string_utils.hpp" -#include "../base/logging.hpp" -#include "../base/stl_add.hpp" +#include "base/assert.hpp" +#include "base/timer.hpp" +#include "base/scope_guard.hpp" +#include "base/string_utils.hpp" +#include "base/logging.hpp" +#include "base/stl_add.hpp" -#include "../std/algorithm.hpp" -#include "../std/fstream.hpp" -#include "../std/initializer_list.hpp" -#include "../std/limits.hpp" -#include "../std/unordered_map.hpp" -#include "../std/vector.hpp" +#include "std/algorithm.hpp" +#include "std/fstream.hpp" +#include "std/initializer_list.hpp" +#include "std/limits.hpp" +#include "std/unordered_map.hpp" +#include "std/vector.hpp" #define SYNONYMS_FILE "synonyms.txt" diff --git a/indexer/search_index_builder.hpp b/indexer/search_index_builder.hpp index c661a6ebb4..e22a9e35af 100644 --- a/indexer/search_index_builder.hpp +++ b/indexer/search_index_builder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../std/string.hpp" +#include "std/string.hpp" class FilesContainerR; class Writer; diff --git a/indexer/search_string_utils.cpp b/indexer/search_string_utils.cpp index 8995a37073..fc3586b260 100644 --- a/indexer/search_string_utils.cpp +++ b/indexer/search_string_utils.cpp @@ -1,6 +1,6 @@ -#include "search_string_utils.hpp" +#include "indexer/search_string_utils.hpp" -#include "../base/macros.hpp" +#include "base/macros.hpp" strings::UniString search::FeatureTypeToString(uint32_t type) { diff --git a/indexer/search_string_utils.hpp b/indexer/search_string_utils.hpp index 09315cc58f..53a6977971 100644 --- a/indexer/search_string_utils.hpp +++ b/indexer/search_string_utils.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../base/string_utils.hpp" +#include "base/string_utils.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" namespace search { diff --git a/indexer/search_trie.hpp b/indexer/search_trie.hpp index 3375d93e75..1840d592c2 100644 --- a/indexer/search_trie.hpp +++ b/indexer/search_trie.hpp @@ -1,10 +1,10 @@ #pragma once -#include "geometry_serialization.hpp" +#include "indexer/geometry_serialization.hpp" -#include "../coding/reader.hpp" -#include "../coding/trie.hpp" -#include "../coding/trie_reader.hpp" +#include "coding/reader.hpp" +#include "coding/trie.hpp" +#include "coding/trie_reader.hpp" namespace search diff --git a/indexer/string_file.hpp b/indexer/string_file.hpp index 9d90d28b16..2bd20e8884 100644 --- a/indexer/string_file.hpp +++ b/indexer/string_file.hpp @@ -1,18 +1,18 @@ #pragma once -#include "../coding/file_writer.hpp" -#include "../coding/file_reader.hpp" - -#include "../base/macros.hpp" -#include "../base/mem_trie.hpp" -#include "../base/string_utils.hpp" -#include "../base/worker_thread.hpp" - -#include "../coding/read_write_utils.hpp" -#include "../std/iterator_facade.hpp" -#include "../std/queue.hpp" -#include "../std/functional.hpp" -#include "../std/unique_ptr.hpp" +#include "coding/file_writer.hpp" +#include "coding/file_reader.hpp" + +#include "base/macros.hpp" +#include "base/mem_trie.hpp" +#include "base/string_utils.hpp" +#include "base/worker_thread.hpp" + +#include "coding/read_write_utils.hpp" +#include "std/iterator_facade.hpp" +#include "std/queue.hpp" +#include "std/functional.hpp" +#include "std/unique_ptr.hpp" template <typename TValue> class StringsFile diff --git a/indexer/string_file_values.hpp b/indexer/string_file_values.hpp index cdfe7522c9..ca04a43198 100644 --- a/indexer/string_file_values.hpp +++ b/indexer/string_file_values.hpp @@ -1,12 +1,12 @@ #pragma once -#include "../coding/compressed_bit_vector.hpp" -#include "../coding/read_write_utils.hpp" -#include "../coding/write_to_sink.hpp" +#include "coding/compressed_bit_vector.hpp" +#include "coding/read_write_utils.hpp" +#include "coding/write_to_sink.hpp" -#include "../base/assert.hpp" +#include "base/assert.hpp" -#include "../std/algorithm.hpp" +#include "std/algorithm.hpp" /// Following classes are supposed to be used with StringsFile. They /// allow to write/read them, compare or serialize to an in-memory diff --git a/indexer/tesselator_decl.hpp b/indexer/tesselator_decl.hpp index 83284dd0e0..cc1353fcb4 100644 --- a/indexer/tesselator_decl.hpp +++ b/indexer/tesselator_decl.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../base/assert.hpp" +#include "base/assert.hpp" namespace tesselator { diff --git a/indexer/tree_structure.hpp b/indexer/tree_structure.hpp index 173178c09e..525e1d9eb2 100644 --- a/indexer/tree_structure.hpp +++ b/indexer/tree_structure.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../base/assert.hpp" +#include "base/assert.hpp" -#include "../std/iostream.hpp" +#include "std/iostream.hpp" namespace tree diff --git a/indexer/types_mapping.cpp b/indexer/types_mapping.cpp index a97e8b6716..bab9891d21 100644 --- a/indexer/types_mapping.cpp +++ b/indexer/types_mapping.cpp @@ -1,8 +1,8 @@ -#include "types_mapping.hpp" -#include "classificator.hpp" +#include "indexer/types_mapping.hpp" +#include "indexer/classificator.hpp" -#include "../base/string_utils.hpp" -#include "../base/stl_add.hpp" +#include "base/string_utils.hpp" +#include "base/stl_add.hpp" void IndexAndTypeMapping::Clear() diff --git a/indexer/types_mapping.hpp b/indexer/types_mapping.hpp index 90192bb329..1b3b9d1bad 100644 --- a/indexer/types_mapping.hpp +++ b/indexer/types_mapping.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../base/assert.hpp" +#include "base/assert.hpp" -#include "../std/vector.hpp" -#include "../std/map.hpp" -#include "../std/iostream.hpp" +#include "std/vector.hpp" +#include "std/map.hpp" +#include "std/iostream.hpp" class IndexAndTypeMapping |