From 0ba1e4f8da668c332d8b02d77cbb54294dea489d Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Wed, 28 Dec 2016 15:57:07 +0300 Subject: [PATCH] Sort includes and other --- base/base.cpp | 3 +- base/base_tests/bits_test.cpp | 2 + base/base_tests/string_utils_test.cpp | 1 + base/cache.hpp | 2 +- base/condition.cpp | 6 +- base/internal/message.hpp | 3 +- base/limited_priority_queue.hpp | 2 +- base/logging.cpp | 6 +- base/matrix.hpp | 3 +- base/shared_buffer_manager.hpp | 4 +- base/string_format.hpp | 3 +- base/strings_bundle.hpp | 3 +- base/timer.cpp | 1 - drape_frontend/watch/software_renderer.hpp | 2 +- drape_frontend/watch/text_engine.h | 3 - .../generator_tests/osm_o5m_source_test.cpp | 2 +- generator/osm2type.cpp | 2 +- geometry/algorithm.hpp | 4 +- search/house_numbers_matcher.hpp | 2 +- xcode/base/base.xcodeproj/project.pbxproj | 52 +++++++------- .../generator.xcodeproj/project.pbxproj | 70 +++++++++---------- .../geometry.xcodeproj/project.pbxproj | 22 +++--- 22 files changed, 96 insertions(+), 102 deletions(-) diff --git a/base/base.cpp b/base/base.cpp index 53d5c522f5..ab46769aa0 100644 --- a/base/base.cpp +++ b/base/base.cpp @@ -4,10 +4,9 @@ #include "std/target_os.hpp" -#include #include #include - +#include namespace my { diff --git a/base/base_tests/bits_test.cpp b/base/base_tests/bits_test.cpp index c7184b6055..c2a43733ea 100644 --- a/base/base_tests/bits_test.cpp +++ b/base/base_tests/bits_test.cpp @@ -3,6 +3,8 @@ #include "base/bits.hpp" #include "std/cstdlib.hpp" +#include + namespace { template uint32_t PopCountSimple(T x) diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp index 8f01391353..0f2438bf5c 100644 --- a/base/base_tests/string_utils_test.cpp +++ b/base/base_tests/string_utils_test.cpp @@ -10,6 +10,7 @@ #include "std/unordered_map.hpp" #include "std/vector.hpp" +#include /// internal function in base namespace strings { UniChar LowerUniChar(UniChar c); } diff --git a/base/cache.hpp b/base/cache.hpp index 9efa576f56..df7da76f13 100644 --- a/base/cache.hpp +++ b/base/cache.hpp @@ -4,8 +4,8 @@ #include "base/base.hpp" #include "base/macros.hpp" -#include #include +#include #include diff --git a/base/condition.cpp b/base/condition.cpp index fd66f3b872..1082a04346 100644 --- a/base/condition.cpp +++ b/base/condition.cpp @@ -1,15 +1,13 @@ #include "base/condition.hpp" +#include "base/mutex.hpp" #include "std/target_os.hpp" - -#include "base/mutex.hpp" #include "std/systime.hpp" #include -#include #include - +#include namespace threads { diff --git a/base/internal/message.hpp b/base/internal/message.hpp index 03d6d0f957..7fff004c01 100644 --- a/base/internal/message.hpp +++ b/base/internal/message.hpp @@ -1,4 +1,5 @@ #pragma once + #include #include #include @@ -6,10 +7,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include diff --git a/base/limited_priority_queue.hpp b/base/limited_priority_queue.hpp index 15bf294bf0..16a5ce6fd8 100644 --- a/base/limited_priority_queue.hpp +++ b/base/limited_priority_queue.hpp @@ -11,7 +11,7 @@ namespace my { // Priority queue that stores only N smallest elements. -template > +template > class limited_priority_queue { public: diff --git a/base/logging.cpp b/base/logging.cpp index 5e77051daa..0f1e002a9b 100644 --- a/base/logging.cpp +++ b/base/logging.cpp @@ -5,13 +5,13 @@ #include "base/thread.hpp" #include "base/timer.hpp" +#include "std/target_os.hpp" +//#include "std/windows.hpp" + #include #include #include #include -#include "std/target_os.hpp" -//#include "std/windows.hpp" - namespace my { diff --git a/base/matrix.hpp b/base/matrix.hpp index 63df382938..c33963b890 100644 --- a/base/matrix.hpp +++ b/base/matrix.hpp @@ -2,9 +2,8 @@ #include "base/math.hpp" -#include #include - +#include namespace math { diff --git a/base/shared_buffer_manager.hpp b/base/shared_buffer_manager.hpp index 42a6da9aa2..9aa02b0f01 100644 --- a/base/shared_buffer_manager.hpp +++ b/base/shared_buffer_manager.hpp @@ -2,10 +2,10 @@ #include "base/mutex.hpp" -#include -#include #include #include +#include +#include class SharedBufferManager { diff --git a/base/string_format.hpp b/base/string_format.hpp index a5186fcbaa..c864c56828 100644 --- a/base/string_format.hpp +++ b/base/string_format.hpp @@ -2,9 +2,8 @@ #include "base/base.hpp" #include "base/macros.hpp" -#include #include - +#include namespace strings { diff --git a/base/strings_bundle.hpp b/base/strings_bundle.hpp index 8cc407bc0b..53e44ef965 100644 --- a/base/strings_bundle.hpp +++ b/base/strings_bundle.hpp @@ -1,8 +1,7 @@ #pragma once -#include #include - +#include class StringsBundle { diff --git a/base/timer.cpp b/base/timer.cpp index 07ca601f6a..706dde5fcb 100644 --- a/base/timer.cpp +++ b/base/timer.cpp @@ -15,7 +15,6 @@ #ifndef OMIM_OS_LINUX using std::get_time; using std::put_time; - #else #include diff --git a/drape_frontend/watch/software_renderer.hpp b/drape_frontend/watch/software_renderer.hpp index 04eeb9fea5..123503ee7a 100644 --- a/drape_frontend/watch/software_renderer.hpp +++ b/drape_frontend/watch/software_renderer.hpp @@ -22,10 +22,10 @@ #include "3party/agg/agg_renderer_primitives.h" #include "3party/agg/agg_path_storage.h" -#include "std/algorithm.hpp" #include "std/cstdint.hpp" #include "std/map.hpp" #include "std/unique_ptr.hpp" +#include "std/vector.hpp" namespace df { diff --git a/drape_frontend/watch/text_engine.h b/drape_frontend/watch/text_engine.h index 6f9a633d27..a38d49211e 100644 --- a/drape_frontend/watch/text_engine.h +++ b/drape_frontend/watch/text_engine.h @@ -13,16 +13,13 @@ #include FT_GLYPH_H #include FT_STROKER_H -//#include "base/utility.h" #include "point.h" #include "rect.h" -//#include "images/style.h" #include "base/string_utils.hpp" #include "std/utility.hpp" - namespace ml { class text_engine; diff --git a/generator/generator_tests/osm_o5m_source_test.cpp b/generator/generator_tests/osm_o5m_source_test.cpp index f3b539cd78..7ab8c54cfb 100644 --- a/generator/generator_tests/osm_o5m_source_test.cpp +++ b/generator/generator_tests/osm_o5m_source_test.cpp @@ -4,8 +4,8 @@ #include "std/iterator.hpp" #include "std/set.hpp" -#include "std/vector.hpp" #include "std/utility.hpp" +#include "std/vector.hpp" #include "source_data.hpp" diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 5544de47fa..3cf6cbdbca 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -12,8 +12,8 @@ #include "base/string_utils.hpp" #include "std/bind.hpp" -#include "std/initializer_list.hpp" #include "std/function.hpp" +#include "std/initializer_list.hpp" #include "std/set.hpp" #include "std/vector.hpp" diff --git a/geometry/algorithm.hpp b/geometry/algorithm.hpp index b9abbe9337..89f95150bd 100644 --- a/geometry/algorithm.hpp +++ b/geometry/algorithm.hpp @@ -3,10 +3,10 @@ #include "geometry/point2d.hpp" #include "geometry/rect2d.hpp" -#include "std/type_traits.hpp" #include "std/array.hpp" -#include "std/vector.hpp" +#include "std/type_traits.hpp" #include "std/utility.hpp" +#include "std/vector.hpp" namespace m2 { diff --git a/search/house_numbers_matcher.hpp b/search/house_numbers_matcher.hpp index 1aa47d8d18..c30fc1acaa 100644 --- a/search/house_numbers_matcher.hpp +++ b/search/house_numbers_matcher.hpp @@ -3,8 +3,8 @@ #include "base/string_utils.hpp" #include "std/string.hpp" -#include "std/vector.hpp" #include "std/utility.hpp" +#include "std/vector.hpp" namespace search { diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj index 98b89eb881..f044b90146 100644 --- a/xcode/base/base.xcodeproj/project.pbxproj +++ b/xcode/base/base.xcodeproj/project.pbxproj @@ -307,30 +307,6 @@ 675341791A3F57BF00A0A8C3 /* base */ = { isa = PBXGroup; children = ( - 672DD4B01E04255F0078E13C /* cancellable.hpp */, - 672DD4B11E04255F0078E13C /* collection_cast.hpp */, - 672DD4B31E04255F0078E13C /* condition.cpp */, - 672DD4B41E04255F0078E13C /* condition.hpp */, - 672DD4B51E04255F0078E13C /* mem_trie.hpp */, - 672DD4B61E04255F0078E13C /* newtype.hpp */, - 672DD4B71E04255F0078E13C /* observer_list.hpp */, - 672DD4B81E0425600078E13C /* range_iterator.hpp */, - 672DD4B91E0425600078E13C /* ref_counted.hpp */, - 672DD4BA1E0425600078E13C /* stl_helpers.hpp */, - 3446C66C1DDCA96300146687 /* dfa_helpers.hpp */, - 3446C66D1DDCA96300146687 /* levenshtein_dfa.cpp */, - 3446C66E1DDCA96300146687 /* levenshtein_dfa.hpp */, - 3446C66F1DDCA96300146687 /* uni_string_dfa.cpp */, - 3446C6701DDCA96300146687 /* uni_string_dfa.hpp */, - 671182EE1C807C0A00CB8177 /* gmtime.cpp */, - 671182EF1C807C0A00CB8177 /* gmtime.hpp */, - 670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */, - 670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */, - 674A7E2C1C0DB03D003D48E1 /* timegm.cpp */, - 674A7E2D1C0DB03D003D48E1 /* timegm.hpp */, - 675345381A3F6F5E00A0A8C3 /* internal */, - 67B52B5E1AD3C84E00664C17 /* thread_checker.cpp */, - 67B52B5F1AD3C84E00664C17 /* thread_checker.hpp */, 675341851A3F57E400A0A8C3 /* array_adapters.hpp */, 675341861A3F57E400A0A8C3 /* assert.hpp */, 675341871A3F57E400A0A8C3 /* base.cpp */, @@ -338,8 +314,20 @@ 675341891A3F57E400A0A8C3 /* bits.hpp */, 6753418A1A3F57E400A0A8C3 /* buffer_vector.hpp */, 6753418B1A3F57E400A0A8C3 /* cache.hpp */, + 672DD4B01E04255F0078E13C /* cancellable.hpp */, + 672DD4B11E04255F0078E13C /* collection_cast.hpp */, + 672DD4B31E04255F0078E13C /* condition.cpp */, + 672DD4B41E04255F0078E13C /* condition.hpp */, + 67A609AC1C88642E001E641A /* deferred_task.cpp */, + 67A609AD1C88642E001E641A /* deferred_task.hpp */, + 3446C66C1DDCA96300146687 /* dfa_helpers.hpp */, 675341941A3F57E400A0A8C3 /* exception.cpp */, 675341951A3F57E400A0A8C3 /* exception.hpp */, + 671182EE1C807C0A00CB8177 /* gmtime.cpp */, + 671182EF1C807C0A00CB8177 /* gmtime.hpp */, + 675345381A3F6F5E00A0A8C3 /* internal */, + 3446C66D1DDCA96300146687 /* levenshtein_dfa.cpp */, + 3446C66E1DDCA96300146687 /* levenshtein_dfa.hpp */, 675341991A3F57E400A0A8C3 /* limited_priority_queue.hpp */, 6753419A1A3F57E400A0A8C3 /* logging.cpp */, 6753419B1A3F57E400A0A8C3 /* logging.hpp */, @@ -347,8 +335,13 @@ 6753419D1A3F57E400A0A8C3 /* macros.hpp */, 6753419E1A3F57E400A0A8C3 /* math.hpp */, 6753419F1A3F57E400A0A8C3 /* matrix.hpp */, + 672DD4B51E04255F0078E13C /* mem_trie.hpp */, 675341A11A3F57E400A0A8C3 /* mutex.hpp */, + 672DD4B61E04255F0078E13C /* newtype.hpp */, 675341A21A3F57E400A0A8C3 /* normalize_unicode.cpp */, + 672DD4B71E04255F0078E13C /* observer_list.hpp */, + 672DD4B81E0425600078E13C /* range_iterator.hpp */, + 672DD4B91E0425600078E13C /* ref_counted.hpp */, 675341AA1A3F57E400A0A8C3 /* rolling_hash.hpp */, 675341AF1A3F57E400A0A8C3 /* scope_guard.hpp */, 675341B01A3F57E400A0A8C3 /* set_operations.hpp */, @@ -359,6 +352,7 @@ 675341B61A3F57E400A0A8C3 /* stats.hpp */, 675341B71A3F57E400A0A8C3 /* std_serialization.hpp */, 675341B81A3F57E400A0A8C3 /* stl_add.hpp */, + 672DD4BA1E0425600078E13C /* stl_helpers.hpp */, 675341B91A3F57E400A0A8C3 /* stl_iterator.hpp */, 675341BA1A3F57E400A0A8C3 /* string_format.cpp */, 675341BB1A3F57E400A0A8C3 /* string_format.hpp */, @@ -366,6 +360,10 @@ 675341BD1A3F57E400A0A8C3 /* string_utils.hpp */, 675341BE1A3F57E400A0A8C3 /* strings_bundle.cpp */, 675341BF1A3F57E400A0A8C3 /* strings_bundle.hpp */, + 670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */, + 670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */, + 67B52B5E1AD3C84E00664C17 /* thread_checker.cpp */, + 67B52B5F1AD3C84E00664C17 /* thread_checker.hpp */, 675341C11A3F57E400A0A8C3 /* thread_pool.cpp */, 675341C21A3F57E400A0A8C3 /* thread_pool.hpp */, 675341C31A3F57E400A0A8C3 /* thread.cpp */, @@ -373,10 +371,12 @@ 675341C51A3F57E400A0A8C3 /* threaded_container.cpp */, 675341C61A3F57E400A0A8C3 /* threaded_container.hpp */, 675341C71A3F57E400A0A8C3 /* threaded_list.hpp */, + 674A7E2C1C0DB03D003D48E1 /* timegm.cpp */, + 674A7E2D1C0DB03D003D48E1 /* timegm.hpp */, 675341C91A3F57E400A0A8C3 /* timer.cpp */, 675341CA1A3F57E400A0A8C3 /* timer.hpp */, - 67A609AC1C88642E001E641A /* deferred_task.cpp */, - 67A609AD1C88642E001E641A /* deferred_task.hpp */, + 3446C66F1DDCA96300146687 /* uni_string_dfa.cpp */, + 3446C6701DDCA96300146687 /* uni_string_dfa.hpp */, ); name = base; path = ../../base; diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index 1f3548a369..698e748f5b 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -215,41 +215,22 @@ 6753401D1A3F2A1B00A0A8C3 /* generator */ = { isa = PBXGroup; children = ( - 34F558901DBF4CC300A4FC11 /* srtm_coverage_checker.cpp */, - 34F5588E1DBF4C9F00A4FC11 /* restaurants_info.cpp */, - 34F5587E1DBF4C9600A4FC11 /* opentable_dataset.cpp */, - 34F5587F1DBF4C9600A4FC11 /* opentable_dataset.hpp */, - 34F558801DBF4C9600A4FC11 /* opentable_scoring.cpp */, - 34F558811DBF4C9600A4FC11 /* sponsored_dataset_inl.hpp */, - 34F558821DBF4C9600A4FC11 /* sponsored_dataset.hpp */, - 34F558831DBF4C9600A4FC11 /* sponsored_scoring.cpp */, - 34F558841DBF4C9600A4FC11 /* sponsored_scoring.hpp */, - 34F5587A1DBF4C8300A4FC11 /* feature_segments_checker.cpp */, - 34F558771DBF4C7800A4FC11 /* booking_quality_check.cpp */, 3D51BC4A1D5E512500F1FA8D /* altitude_generator.cpp */, 3D51BC4B1D5E512500F1FA8D /* altitude_generator.hpp */, - 3D51BC4E1D5E512500F1FA8D /* region_meta.cpp */, - 3D51BC4F1D5E512500F1FA8D /* region_meta.hpp */, - 3D51BC501D5E512500F1FA8D /* srtm_parser.cpp */, - 3D51BC511D5E512500F1FA8D /* srtm_parser.hpp */, - 3D51BC461D5E50F700F1FA8D /* centers_table_builder.cpp */, - 3D51BC471D5E50F700F1FA8D /* centers_table_builder.hpp */, + 67A0FEBC1CEB467F008F2A61 /* booking_dataset.cpp */, + 67A0FEBD1CEB467F008F2A61 /* booking_dataset.hpp */, + 34F558771DBF4C7800A4FC11 /* booking_quality_check.cpp */, E9502E311D34012200CAB86B /* booking_scoring.cpp */, - 677E2A111CAACC5F001DC42A /* tag_admixer.hpp */, - 677E2A121CAACC5F001DC42A /* towns_dumper.cpp */, - 677E2A131CAACC5F001DC42A /* towns_dumper.hpp */, - 675340911C5231BA002CF0D9 /* search_index_builder.cpp */, - 675340921C5231BA002CF0D9 /* search_index_builder.hpp */, 675340291A3F2A7400A0A8C3 /* borders_generator.cpp */, 6753402A1A3F2A7400A0A8C3 /* borders_generator.hpp */, 6753402B1A3F2A7400A0A8C3 /* borders_loader.cpp */, 6753402C1A3F2A7400A0A8C3 /* borders_loader.hpp */, + 3D51BC461D5E50F700F1FA8D /* centers_table_builder.cpp */, + 3D51BC471D5E50F700F1FA8D /* centers_table_builder.hpp */, 6753402D1A3F2A7400A0A8C3 /* check_model.cpp */, 6753402E1A3F2A7400A0A8C3 /* check_model.hpp */, 6753402F1A3F2A7400A0A8C3 /* coastlines_generator.cpp */, 675340301A3F2A7400A0A8C3 /* coastlines_generator.hpp */, - 675340311A3F2A7400A0A8C3 /* intermediate_data.hpp */, - 675340451A3F2A7400A0A8C3 /* intermediate_elements.hpp */, 675340341A3F2A7400A0A8C3 /* dumper.cpp */, 675340351A3F2A7400A0A8C3 /* dumper.hpp */, 675340361A3F2A7400A0A8C3 /* feature_builder.cpp */, @@ -259,38 +240,57 @@ 6753403A1A3F2A7400A0A8C3 /* feature_generator.hpp */, 6753403B1A3F2A7400A0A8C3 /* feature_merger.cpp */, 6753403C1A3F2A7400A0A8C3 /* feature_merger.hpp */, + 34F5587A1DBF4C8300A4FC11 /* feature_segments_checker.cpp */, 6753403D1A3F2A7400A0A8C3 /* feature_sorter.cpp */, 6753403E1A3F2A7400A0A8C3 /* feature_sorter.hpp */, 675340401A3F2A7400A0A8C3 /* gen_mwm_info.hpp */, 675340411A3F2A7400A0A8C3 /* generate_info.hpp */, - 675340461A3F2A7400A0A8C3 /* osm_translator.hpp */, + 675340311A3F2A7400A0A8C3 /* intermediate_data.hpp */, + 675340451A3F2A7400A0A8C3 /* intermediate_elements.hpp */, + 34F5587E1DBF4C9600A4FC11 /* opentable_dataset.cpp */, + 34F5587F1DBF4C9600A4FC11 /* opentable_dataset.hpp */, + 34F558801DBF4C9600A4FC11 /* opentable_scoring.cpp */, + 6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */, + 6753405B1A3F2A7400A0A8C3 /* osm_element.hpp */, 675340471A3F2A7400A0A8C3 /* osm_id.cpp */, 675340481A3F2A7400A0A8C3 /* osm_id.hpp */, - 6753404B1A3F2A7400A0A8C3 /* osm2type.cpp */, - 6753404C1A3F2A7400A0A8C3 /* osm2type.hpp */, + 6764B8921ADD6A3300DD8B15 /* osm_o5m_source.hpp */, + 670B84BA1A8CDB0000CE4492 /* osm_source.cpp */, + 670B84BB1A8CDB0000CE4492 /* osm_source.hpp */, + 675340461A3F2A7400A0A8C3 /* osm_translator.hpp */, + 67F0F6761B8C9DCE003F52FF /* osm_xml_source.hpp */, 6726C1D31A4AFEF4005EEA39 /* osm2meta.cpp */, 6726C1D41A4AFEF4005EEA39 /* osm2meta.hpp */, + 6753404B1A3F2A7400A0A8C3 /* osm2type.cpp */, + 6753404C1A3F2A7400A0A8C3 /* osm2type.hpp */, 6753404D1A3F2A7400A0A8C3 /* polygonizer.hpp */, + 3D51BC4E1D5E512500F1FA8D /* region_meta.cpp */, + 3D51BC4F1D5E512500F1FA8D /* region_meta.hpp */, + 34F5588E1DBF4C9F00A4FC11 /* restaurants_info.cpp */, 6753404E1A3F2A7400A0A8C3 /* routing_generator.cpp */, 6753404F1A3F2A7400A0A8C3 /* routing_generator.hpp */, 0C5FEC6E1DDE19E50017688C /* routing_index_generator.cpp */, 0C5FEC6F1DDE19E50017688C /* routing_index_generator.hpp */, + 675340911C5231BA002CF0D9 /* search_index_builder.cpp */, + 675340921C5231BA002CF0D9 /* search_index_builder.hpp */, + 34F558811DBF4C9600A4FC11 /* sponsored_dataset_inl.hpp */, + 34F558821DBF4C9600A4FC11 /* sponsored_dataset.hpp */, + 34F558831DBF4C9600A4FC11 /* sponsored_scoring.cpp */, + 34F558841DBF4C9600A4FC11 /* sponsored_scoring.hpp */, + 34F558901DBF4CC300A4FC11 /* srtm_coverage_checker.cpp */, + 3D51BC501D5E512500F1FA8D /* srtm_parser.cpp */, + 3D51BC511D5E512500F1FA8D /* srtm_parser.hpp */, 675340501A3F2A7400A0A8C3 /* statistics.cpp */, 675340511A3F2A7400A0A8C3 /* statistics.hpp */, + 677E2A111CAACC5F001DC42A /* tag_admixer.hpp */, 675340521A3F2A7400A0A8C3 /* tesselator.cpp */, 675340531A3F2A7400A0A8C3 /* tesselator.hpp */, + 677E2A121CAACC5F001DC42A /* towns_dumper.cpp */, + 677E2A131CAACC5F001DC42A /* towns_dumper.hpp */, 675340541A3F2A7400A0A8C3 /* unpack_mwm.cpp */, 675340551A3F2A7400A0A8C3 /* unpack_mwm.hpp */, 675340581A3F2A7400A0A8C3 /* ways_merger.hpp */, 675340591A3F2A7400A0A8C3 /* world_map_generator.hpp */, - 6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */, - 6753405B1A3F2A7400A0A8C3 /* osm_element.hpp */, - 670B84BA1A8CDB0000CE4492 /* osm_source.cpp */, - 670B84BB1A8CDB0000CE4492 /* osm_source.hpp */, - 6764B8921ADD6A3300DD8B15 /* osm_o5m_source.hpp */, - 67F0F6761B8C9DCE003F52FF /* osm_xml_source.hpp */, - 67A0FEBC1CEB467F008F2A61 /* booking_dataset.cpp */, - 67A0FEBD1CEB467F008F2A61 /* booking_dataset.hpp */, ); name = generator; path = ../../generator; diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj index 7651189ce4..70812d901a 100644 --- a/xcode/geometry/geometry.xcodeproj/project.pbxproj +++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj @@ -268,29 +268,24 @@ 675344931A3F684600A0A8C3 /* geometry */ = { isa = PBXGroup; children = ( - 345C55F31C93140A00B6783F /* clipping.cpp */, - 345C55F41C93140A00B6783F /* clipping.hpp */, 56D545681C74A46D00E3719C /* algorithm.cpp */, 56D545691C74A46D00E3719C /* algorithm.hpp */, - 56EB1ECE1C6B6DF30022D831 /* segment2d.cpp */, - 56EB1ECF1C6B6DF30022D831 /* segment2d.hpp */, - 347F336E1C454205009758CC /* triangle2d.cpp */, - 347F336F1C454205009758CC /* triangle2d.hpp */, - E92D8BD21C15AFAA00A98D17 /* mercator.cpp */, - E92D8BD31C15AFAA00A98D17 /* mercator.hpp */, - 6741AA9E1BF35476002C974C /* latlon.cpp */, - 6741AA9F1BF35476002C974C /* latlon.hpp */, - 675344DA1A3F68E200A0A8C3 /* region2d */, 6753449F1A3F687400A0A8C3 /* angles.cpp */, 675344A01A3F687400A0A8C3 /* angles.hpp */, 675344A11A3F687400A0A8C3 /* any_rect2d.hpp */, 675344A21A3F687400A0A8C3 /* avg_vector.hpp */, 675344A31A3F687400A0A8C3 /* cellid.hpp */, + 345C55F31C93140A00B6783F /* clipping.cpp */, + 345C55F41C93140A00B6783F /* clipping.hpp */, 675344A41A3F687400A0A8C3 /* covering_utils.hpp */, 675344A51A3F687400A0A8C3 /* covering.hpp */, 675344A61A3F687400A0A8C3 /* distance_on_sphere.cpp */, 675344A71A3F687400A0A8C3 /* distance_on_sphere.hpp */, 675344A81A3F687400A0A8C3 /* distance.hpp */, + 6741AA9E1BF35476002C974C /* latlon.cpp */, + 6741AA9F1BF35476002C974C /* latlon.hpp */, + E92D8BD21C15AFAA00A98D17 /* mercator.cpp */, + E92D8BD31C15AFAA00A98D17 /* mercator.hpp */, 675344A91A3F687400A0A8C3 /* packer.cpp */, 675344AA1A3F687400A0A8C3 /* packer.hpp */, 675344AB1A3F687400A0A8C3 /* point2d.hpp */, @@ -299,16 +294,21 @@ 675344AE1A3F687400A0A8C3 /* polyline2d.hpp */, 675344AF1A3F687400A0A8C3 /* rect_intersect.hpp */, 675344B01A3F687400A0A8C3 /* rect2d.hpp */, + 675344DA1A3F68E200A0A8C3 /* region2d */, 675344B21A3F687400A0A8C3 /* region2d.hpp */, 675344B31A3F687400A0A8C3 /* robust_orientation.cpp */, 675344B41A3F687400A0A8C3 /* robust_orientation.hpp */, 675344B51A3F687400A0A8C3 /* screenbase.cpp */, 675344B61A3F687400A0A8C3 /* screenbase.hpp */, + 56EB1ECE1C6B6DF30022D831 /* segment2d.cpp */, + 56EB1ECF1C6B6DF30022D831 /* segment2d.hpp */, 675344B71A3F687400A0A8C3 /* simplification.hpp */, 675344B81A3F687400A0A8C3 /* spline.cpp */, 675344B91A3F687400A0A8C3 /* spline.hpp */, 675344BA1A3F687400A0A8C3 /* transformations.hpp */, 675344BB1A3F687400A0A8C3 /* tree4d.hpp */, + 347F336E1C454205009758CC /* triangle2d.cpp */, + 347F336F1C454205009758CC /* triangle2d.hpp */, ); name = geometry; path = ../../geometry;