diff --git a/base/bits.hpp b/base/bits.hpp index 03c938e55e..4d79dff122 100644 --- a/base/bits.hpp +++ b/base/bits.hpp @@ -1,7 +1,9 @@ #pragma once #include "base.hpp" + #include "../std/type_traits.hpp" + namespace bits { // Count the number of 1 bits. Implementation: see Hacker's delight book. diff --git a/coding/blob_indexer.cpp b/coding/blob_indexer.cpp index a0b20a9cad..b86c10a5ae 100644 --- a/coding/blob_indexer.cpp +++ b/coding/blob_indexer.cpp @@ -1,15 +1,11 @@ #include "blob_indexer.hpp" -#include "../coding/byte_stream.hpp" -#include "../coding/endianness.hpp" -#include "../coding/varint.hpp" + #include "../coding/writer.hpp" #include "../coding/write_to_sink.hpp" + #include "../base/assert.hpp" -#include "../base/base.hpp" #include "../base/logging.hpp" -#include "../std/algorithm.hpp" -#include "../std/set.hpp" -#include "../std/string.hpp" + BlobIndexer::BlobIndexer(Writer & writer, size_t maxUncompressedChunkSize, diff --git a/coding/blob_indexer.hpp b/coding/blob_indexer.hpp index 3f23c1e3cc..aeaafe0b34 100644 --- a/coding/blob_indexer.hpp +++ b/coding/blob_indexer.hpp @@ -1,8 +1,10 @@ #pragma once +#include "../base/base.hpp" + #include "../std/function.hpp" #include "../std/string.hpp" #include "../std/vector.hpp" -#include "../base/base.hpp" + class Writer; diff --git a/coding/coding_tests/dd_vector_test.cpp b/coding/coding_tests/dd_vector_test.cpp index 9eadfb87b2..42eb8e1f7b 100644 --- a/coding/coding_tests/dd_vector_test.cpp +++ b/coding/coding_tests/dd_vector_test.cpp @@ -1,10 +1,10 @@ #include "../../testing/testing.hpp" + #include "../dd_vector.hpp" -#include "../endianness.hpp" #include "../reader.hpp" -UNIT_TEST(DDVector) +UNIT_TEST(DDVector_Smoke) { vector data; // Push size. Big endian is used. diff --git a/coding/coding_tests/endianness_test.cpp b/coding/coding_tests/endianness_test.cpp index 821920b8f5..55b8a4c509 100644 --- a/coding/coding_tests/endianness_test.cpp +++ b/coding/coding_tests/endianness_test.cpp @@ -1,8 +1,8 @@ -#include "../../base/SRC_FIRST.hpp" #include "../../testing/testing.hpp" #include "../endianness.hpp" + UNIT_TEST(Endianness1Byte) { TEST_EQUAL(uint8_t(0), ReverseByteOrder(0), ()); diff --git a/coding/reader.hpp b/coding/reader.hpp index ddf6c8b185..58d982d0cc 100644 --- a/coding/reader.hpp +++ b/coding/reader.hpp @@ -2,7 +2,6 @@ #include "endianness.hpp" #include "../base/assert.hpp" -#include "../base/logging.hpp" #include "../base/exception.hpp" #include "../std/shared_array.hpp" diff --git a/generator/check_model.cpp b/generator/check_model.cpp index a175f2ff49..10149c1f92 100644 --- a/generator/check_model.cpp +++ b/generator/check_model.cpp @@ -1,8 +1,10 @@ #include "check_model.hpp" +#include "../defines.hpp" + #include "../indexer/features_vector.hpp" -#include "../defines.hpp" +#include "../base/logging.hpp" namespace check_model diff --git a/geometry/rect2d.hpp b/geometry/rect2d.hpp index 09414221e6..685b47db8d 100644 --- a/geometry/rect2d.hpp +++ b/geometry/rect2d.hpp @@ -1,12 +1,12 @@ #pragma once #include "point2d.hpp" + #include "../base/assert.hpp" #include "../base/internal/message.hpp" #include "../std/algorithm.hpp" #include "../std/limits.hpp" -#include "../std/type_traits.hpp" namespace m2 diff --git a/geometry/region2d.hpp b/geometry/region2d.hpp index 1024e8dca8..3c60874b66 100644 --- a/geometry/region2d.hpp +++ b/geometry/region2d.hpp @@ -7,6 +7,7 @@ #include "../std/algorithm.hpp" #include "../std/type_traits.hpp" + namespace m2 { namespace detail diff --git a/indexer/feature_algo.cpp b/indexer/feature_algo.cpp index b234aa28bf..58248fed4f 100644 --- a/indexer/feature_algo.cpp +++ b/indexer/feature_algo.cpp @@ -1,6 +1,8 @@ #include "feature_algo.hpp" #include "feature.hpp" +#include "../base/logging.hpp" + namespace feature { diff --git a/indexer/interval_index.hpp b/indexer/interval_index.hpp index 57518aaba9..6dffd25ef8 100644 --- a/indexer/interval_index.hpp +++ b/indexer/interval_index.hpp @@ -7,12 +7,8 @@ #include "../coding/varint.hpp" #include "../base/assert.hpp" -#include "../base/base.hpp" -#include "../base/bits.hpp" #include "../base/buffer_vector.hpp" -#include "../base/macros.hpp" -#include "../std/algorithm.hpp" #include "../std/static_assert.hpp" diff --git a/indexer/interval_index_iface.hpp b/indexer/interval_index_iface.hpp index 7d2ce81c8e..ff24ec9dcd 100644 --- a/indexer/interval_index_iface.hpp +++ b/indexer/interval_index_iface.hpp @@ -1,4 +1,6 @@ #pragma once + +#include "../std/stdint.hpp" #include "../std/function.hpp" diff --git a/map/navigator.cpp b/map/navigator.cpp index 4c1abe13a0..705c9ace80 100644 --- a/map/navigator.cpp +++ b/map/navigator.cpp @@ -4,21 +4,17 @@ #include "../platform/settings.hpp" -#include "../coding/file_reader.hpp" -#include "../coding/file_writer.hpp" -#include "../coding/streams_sink.hpp" - #include "../geometry/angles.hpp" #include "../geometry/transformations.hpp" #include "../geometry/point2d.hpp" #include "../geometry/distance_on_sphere.hpp" -#include "../base/std_serialization.hpp" #include "../base/logging.hpp" #include "../std/function.hpp" #include "../std/bind.hpp" + namespace { /// @todo Review this logic in future. diff --git a/platform/platform_tests/apk_test.cpp b/platform/platform_tests/apk_test.cpp index 61a486b286..53d7e285f4 100644 --- a/platform/platform_tests/apk_test.cpp +++ b/platform/platform_tests/apk_test.cpp @@ -6,6 +6,7 @@ #include "../../coding/internal/file_data.hpp" #include "../../base/thread.hpp" +#include "../../base/logging.hpp" #include "../../std/numeric.hpp" diff --git a/qt/about.cpp b/qt/about.cpp index c00698c542..ec25d9b5c4 100644 --- a/qt/about.cpp +++ b/qt/about.cpp @@ -2,10 +2,12 @@ #include "../platform/platform.hpp" -#include +#include "../base/logging.hpp" +#include #include + #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include #include diff --git a/storage/storage_tests/simple_tree_test.cpp b/storage/storage_tests/simple_tree_test.cpp index 28b892249d..903e7d8d00 100644 --- a/storage/storage_tests/simple_tree_test.cpp +++ b/storage/storage_tests/simple_tree_test.cpp @@ -1,11 +1,11 @@ #include "../../testing/testing.hpp" -#include "../../coding/reader.hpp" -#include "../../coding/writer.hpp" -#include "../../coding/streams_sink.hpp" - #include "../simple_tree.hpp" + +namespace +{ + template struct Calculator { @@ -17,10 +17,12 @@ struct Calculator } }; -UNIT_TEST(SimpleTree) +} + +UNIT_TEST(SimpleTree_Smoke) { - typedef SimpleTree mytree; - mytree tree; + typedef SimpleTree TreeT; + TreeT tree; tree.Add(4); tree.Add(3); @@ -42,16 +44,16 @@ UNIT_TEST(SimpleTree) TEST_EQUAL(tree[0][1].Value(), 20, ()); TEST_EQUAL(tree[0][2].Value(), 30, ()); - Calculator c1; + Calculator c1; tree.ForEachSibling(c1); TEST_EQUAL(c1.count, 5, ()); - Calculator c2; + Calculator c2; tree.ForEachChildren(c2); TEST_EQUAL(c2.count, 8, ()); tree.Clear(); - Calculator c3; + Calculator c3; tree.ForEachChildren(c3); TEST_EQUAL(c3.count, 0, ("Tree should be empty")); }