From 0998a6bc3a926e9a3bff5369d380e7b479de1a9d Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sat, 22 Jan 2011 22:36:31 +0200 Subject: [PATCH] Moved defines.hpp to the project root --- storage/defines.hpp => defines.hpp | 0 indexer/data_header_reader.cpp | 2 +- indexer/feature.cpp | 2 +- indexer/features_vector.hpp | 2 +- indexer/index.hpp | 2 +- indexer/index_builder.cpp | 2 +- indexer/indexer_tests/feature_routine.cpp | 2 +- indexer/indexer_tests/index_builder_test.cpp | 2 +- indexer/indexer_tool/feature_bucketer.hpp | 2 +- indexer/indexer_tool/feature_generator.cpp | 2 +- indexer/indexer_tool/feature_sorter.cpp | 2 +- indexer/indexer_tool/indexer_tool.cpp | 2 +- indexer/indexer_tool/update_generator.cpp | 2 +- omim.pro | 2 ++ platform/platform_tests/platform_test.cpp | 2 +- storage/country.hpp | 2 +- storage/storage.hpp | 2 +- storage/storage.pro | 1 - 18 files changed, 17 insertions(+), 16 deletions(-) rename storage/defines.hpp => defines.hpp (100%) diff --git a/storage/defines.hpp b/defines.hpp similarity index 100% rename from storage/defines.hpp rename to defines.hpp diff --git a/indexer/data_header_reader.cpp b/indexer/data_header_reader.cpp index badb5303eb..b9947454ae 100644 --- a/indexer/data_header_reader.cpp +++ b/indexer/data_header_reader.cpp @@ -3,7 +3,7 @@ #include "data_header_reader.hpp" #include "data_header.hpp" -#include "../storage/defines.hpp" +#include "../defines.hpp" #include "../coding/file_container.hpp" diff --git a/indexer/feature.cpp b/indexer/feature.cpp index de9900675d..cde29b3990 100644 --- a/indexer/feature.cpp +++ b/indexer/feature.cpp @@ -5,7 +5,7 @@ #include "feature_visibility.hpp" #include "scales.hpp" -#include "../storage/defines.hpp" // just for file extensions +#include "../defines.hpp" // just for file extensions #include "../geometry/rect2d.hpp" diff --git a/indexer/features_vector.hpp b/indexer/features_vector.hpp index bb9beffc35..b659f838cf 100644 --- a/indexer/features_vector.hpp +++ b/indexer/features_vector.hpp @@ -2,7 +2,7 @@ #include "feature.hpp" #include "data_header_reader.hpp" -#include "../storage/defines.hpp" +#include "../defines.hpp" #include "../coding/var_record_reader.hpp" diff --git a/indexer/index.hpp b/indexer/index.hpp index 735b08403c..7b855cd3c0 100644 --- a/indexer/index.hpp +++ b/indexer/index.hpp @@ -5,7 +5,7 @@ #include "scale_index.hpp" #include "scales.hpp" -#include "../../storage/defines.hpp" +#include "../../defines.hpp" #include "../geometry/rect2d.hpp" diff --git a/indexer/index_builder.cpp b/indexer/index_builder.cpp index b2be291f1b..6cbd78af1e 100644 --- a/indexer/index_builder.cpp +++ b/indexer/index_builder.cpp @@ -2,7 +2,7 @@ #include "data_header_reader.hpp" #include "features_vector.hpp" -#include "../storage/defines.hpp" +#include "../defines.hpp" #include "../coding/file_container.hpp" diff --git a/indexer/indexer_tests/feature_routine.cpp b/indexer/indexer_tests/feature_routine.cpp index ef3358d495..85db2e0f8a 100644 --- a/indexer/indexer_tests/feature_routine.cpp +++ b/indexer/indexer_tests/feature_routine.cpp @@ -2,7 +2,7 @@ #include "feature_routine.hpp" -#include "../../storage/defines.hpp" // just for file extensions +#include "../../defines.hpp" // just for file extensions #include "../feature_impl.hpp" diff --git a/indexer/indexer_tests/index_builder_test.cpp b/indexer/indexer_tests/index_builder_test.cpp index f6616b116c..b80b9e09d7 100644 --- a/indexer/indexer_tests/index_builder_test.cpp +++ b/indexer/indexer_tests/index_builder_test.cpp @@ -5,7 +5,7 @@ #include "../classif_routine.hpp" #include "../features_vector.hpp" #include "../data_header_reader.hpp" -#include "../../storage/defines.hpp" +#include "../../defines.hpp" #include "../../platform/platform.hpp" #include "../../coding/file_container.hpp" #include "../../base/stl_add.hpp" diff --git a/indexer/indexer_tool/feature_bucketer.hpp b/indexer/indexer_tool/feature_bucketer.hpp index dd54ca9121..10470eabce 100644 --- a/indexer/indexer_tool/feature_bucketer.hpp +++ b/indexer/indexer_tool/feature_bucketer.hpp @@ -8,7 +8,7 @@ #include "../../indexer/feature.hpp" #include "../../indexer/feature_visibility.hpp" -#include "../../storage/defines.hpp" +#include "../../defines.hpp" #include "../../std/string.hpp" diff --git a/indexer/indexer_tool/feature_generator.cpp b/indexer/indexer_tool/feature_generator.cpp index 074efbcd05..94ac4a8327 100644 --- a/indexer/indexer_tool/feature_generator.cpp +++ b/indexer/indexer_tool/feature_generator.cpp @@ -4,7 +4,7 @@ #include "osm_element.hpp" #include "polygonizer.hpp" -#include "../../storage/defines.hpp" +#include "../../defines.hpp" #include "../../indexer/data_header.hpp" #include "../../indexer/osm_decl.hpp" diff --git a/indexer/indexer_tool/feature_sorter.cpp b/indexer/indexer_tool/feature_sorter.cpp index 1191e85371..b1f2788f91 100644 --- a/indexer/indexer_tool/feature_sorter.cpp +++ b/indexer/indexer_tool/feature_sorter.cpp @@ -1,7 +1,7 @@ #include "feature_sorter.hpp" #include "feature_generator.hpp" -#include "../../storage/defines.hpp" +#include "../../defines.hpp" #include "../../indexer/data_header.hpp" #include "../../indexer/feature_processor.hpp" diff --git a/indexer/indexer_tool/indexer_tool.cpp b/indexer/indexer_tool/indexer_tool.cpp index bef802cfc6..51f6b08262 100644 --- a/indexer/indexer_tool/indexer_tool.cpp +++ b/indexer/indexer_tool/indexer_tool.cpp @@ -12,7 +12,7 @@ #include "../osm_decl.hpp" #include "../data_header.hpp" -#include "../../storage/defines.hpp" +#include "../../defines.hpp" #include "../../platform/platform.hpp" diff --git a/indexer/indexer_tool/update_generator.cpp b/indexer/indexer_tool/update_generator.cpp index 0d0122a048..5cd587d056 100644 --- a/indexer/indexer_tool/update_generator.cpp +++ b/indexer/indexer_tool/update_generator.cpp @@ -7,7 +7,7 @@ #include "../../platform/platform.hpp" #include "../../storage/country.hpp" -#include "../../storage/defines.hpp" +#include "../../defines.hpp" #include "../../base/string_utils.hpp" #include "../../base/logging.hpp" diff --git a/omim.pro b/omim.pro index f912c8444f..1c45812d08 100644 --- a/omim.pro +++ b/omim.pro @@ -3,6 +3,8 @@ TEMPLATE = subdirs CONFIG += ordered +HEADERS += defines.hpp + # desktop projects win32|macx|unix { SUBDIRS = 3party \ diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp index 419c2cf4ab..8ac08f5460 100644 --- a/platform/platform_tests/platform_test.cpp +++ b/platform/platform_tests/platform_test.cpp @@ -2,7 +2,7 @@ #include "../platform.hpp" -#include "../../storage/defines.hpp" +#include "../../defines.hpp" #include "../../std/stdio.hpp" diff --git a/storage/country.hpp b/storage/country.hpp index 933ce96a44..1850401ceb 100644 --- a/storage/country.hpp +++ b/storage/country.hpp @@ -1,6 +1,6 @@ #pragma once -#include "defines.hpp" +#include "../defines.hpp" #include "simple_tree.hpp" #include "../geometry/rect2d.hpp" diff --git a/storage/storage.hpp b/storage/storage.hpp index a30dac70a6..5e40d4b6e6 100644 --- a/storage/storage.hpp +++ b/storage/storage.hpp @@ -3,7 +3,7 @@ #include "../platform/download_manager.hpp" #include "../platform/platform.hpp" -#include "../storage/defines.hpp" +#include "../defines.hpp" #include "../storage/country.hpp" #include "../std/vector.hpp" diff --git a/storage/storage.pro b/storage/storage.pro index 45255908ee..8c70d87764 100644 --- a/storage/storage.pro +++ b/storage/storage.pro @@ -12,7 +12,6 @@ include($$ROOT_DIR/common.pri) HEADERS += \ country.hpp \ - defines.hpp \ simple_tree.hpp \ storage.hpp \