[base] Replacing osm::Id with GeoObjectId.

1 files changed, 50 insertions, 30 deletions

diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj
index 94930b4700..9d4072f1ed 100644
--- a/xcode/base/base.xcodeproj/project.pbxproj
+++ b/xcode/base/base.xcodeproj/project.pbxproj
@@ -16,15 +16,24 @@
 		3446C67D1DDCAA4900146687 /* uni_string_dfa_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3446C6791DDCAA2500146687 /* uni_string_dfa_test.cpp */; };
 		3446C6821DDCAA7400146687 /* newtype_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3446C67E1DDCAA6E00146687 /* newtype_test.cpp */; };
 		3446C6831DDCAA7800146687 /* ref_counted_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3446C67F1DDCAA6E00146687 /* ref_counted_tests.cpp */; };
-		39B89C3A1FD1898A001104AF /* control_flow_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39B89C391FD1898A001104AF /* control_flow_tests.cpp */; };
+		3917FA53211E008C00937DF4 /* clustering_map.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA52211E008C00937DF4 /* clustering_map.hpp */; };
+		3917FA57211E009700937DF4 /* geo_object_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3917FA54211E009700937DF4 /* geo_object_id.cpp */; };
+		3917FA58211E009700937DF4 /* geo_object_id.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA55211E009700937DF4 /* geo_object_id.hpp */; };
+		3917FA59211E009700937DF4 /* get_time.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA56211E009700937DF4 /* get_time.hpp */; };
+		3917FA5C211E00BB00937DF4 /* pprof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3917FA5A211E00BA00937DF4 /* pprof.cpp */; };
+		3917FA5D211E00BB00937DF4 /* pprof.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA5B211E00BB00937DF4 /* pprof.hpp */; };
+		3917FA5F211E00C400937DF4 /* suffix_array.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3917FA5E211E00C300937DF4 /* suffix_array.hpp */; };
+		3917FA62211E010400937DF4 /* geo_object_id_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3917FA60211E00F100937DF4 /* geo_object_id_tests.cpp */; };
+		3917FA63211E010400937DF4 /* move_to_front_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F995DF20F55B8A0034F977 /* move_to_front_tests.cpp */; };
+		3917FA64211E010400937DF4 /* suffix_array_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F995E120F55B8A0034F977 /* suffix_array_tests.cpp */; };
+		3917FA65211E010400937DF4 /* visitor_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F995E220F55B8A0034F977 /* visitor_tests.cpp */; };
+		3917FA66211E010400937DF4 /* worker_thread_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F995DE20F55B8A0034F977 /* worker_thread_tests.cpp */; };
+		3917FA67211E010400937DF4 /* bwt_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BC707520F55B6700A6EC20 /* bwt_tests.cpp */; };
+		3917FA68211E010400937DF4 /* clustering_map_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BC707420F55B6700A6EC20 /* clustering_map_tests.cpp */; };
+		3917FA69211E010400937DF4 /* fifo_cache_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 564BB446206E8A4D00BDD211 /* fifo_cache_test.cpp */; };
+		3917FA6A211E010400937DF4 /* control_flow_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39B89C391FD1898A001104AF /* control_flow_tests.cpp */; };
+		3917FA6B211E010400937DF4 /* small_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E40EC71E4DC0D500A6D200 /* small_set_test.cpp */; };
 		39BC0FD01FD057FA00B6C276 /* control_flow.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39BC0FCF1FD057F900B6C276 /* control_flow.hpp */; };
-		39BC707620F55B6700A6EC20 /* clustering_map_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BC707420F55B6700A6EC20 /* clustering_map_tests.cpp */; };
-		39BC707720F55B6700A6EC20 /* bwt_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39BC707520F55B6700A6EC20 /* bwt_tests.cpp */; };
-		39F995E320F55B8A0034F977 /* worker_thread_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F995DE20F55B8A0034F977 /* worker_thread_tests.cpp */; };
-		39F995E420F55B8A0034F977 /* move_to_front_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F995DF20F55B8A0034F977 /* move_to_front_tests.cpp */; };
-		39F995E520F55B8A0034F977 /* osm_id_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F995E020F55B8A0034F977 /* osm_id_test.cpp */; };
-		39F995E620F55B8A0034F977 /* suffix_array_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F995E120F55B8A0034F977 /* suffix_array_tests.cpp */; };
-		39F995E720F55B8A0034F977 /* visitor_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39F995E220F55B8A0034F977 /* visitor_tests.cpp */; };
 		39FD271E1CC65AD000AFF551 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD27011CC65A2800AFF551 /* testingmain.cpp */; };
 		39FD271F1CC65AD000AFF551 /* assert_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26C81CC65A0E00AFF551 /* assert_test.cpp */; };
 		39FD27201CC65AD000AFF551 /* bits_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39FD26CA1CC65A0E00AFF551 /* bits_test.cpp */; };
@@ -64,12 +73,9 @@
 		3D7815731F3A145F0068B6AC /* task_loop.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D7815711F3A145F0068B6AC /* task_loop.hpp */; };
 		3D78157B1F3D89EC0068B6AC /* waiter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D78157A1F3D89EC0068B6AC /* waiter.hpp */; };
 		564BB445206E89ED00BDD211 /* fifo_cache.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 564BB444206E89ED00BDD211 /* fifo_cache.hpp */; };
-		564BB447206E8A4D00BDD211 /* fifo_cache_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 564BB446206E8A4D00BDD211 /* fifo_cache_test.cpp */; };
 		56B1A0741E69DE4D00395022 /* random.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56B1A0711E69DE4D00395022 /* random.cpp */; };
 		56B1A0751E69DE4D00395022 /* random.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56B1A0721E69DE4D00395022 /* random.hpp */; };
 		56B1A0761E69DE4D00395022 /* small_set.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56B1A0731E69DE4D00395022 /* small_set.hpp */; };
-		56DE23041FCD8AB4008FEFD5 /* osm_id.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56DE23021FCD8AB3008FEFD5 /* osm_id.hpp */; };
-		56DE23051FCD8AB4008FEFD5 /* osm_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 56DE23031FCD8AB4008FEFD5 /* osm_id.cpp */; };
 		670E39441C46C76900E9C0A6 /* sunrise_sunset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */; };
 		670E39451C46C76900E9C0A6 /* sunrise_sunset.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */; };
 		671182F01C807C0A00CB8177 /* gmtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671182EE1C807C0A00CB8177 /* gmtime.cpp */; };
@@ -136,7 +142,6 @@
 		67A609AF1C88642E001E641A /* deferred_task.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67A609AD1C88642E001E641A /* deferred_task.hpp */; };
 		67B52B601AD3C84E00664C17 /* thread_checker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67B52B5E1AD3C84E00664C17 /* thread_checker.cpp */; };
 		67B52B611AD3C84E00664C17 /* thread_checker.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67B52B5F1AD3C84E00664C17 /* thread_checker.hpp */; };
-		67E40EC81E4DC0D500A6D200 /* small_set_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67E40EC71E4DC0D500A6D200 /* small_set_test.cpp */; };
 		F6F8E3C81EF846CE00F2DE8F /* worker_thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6F8E3C61EF846CE00F2DE8F /* worker_thread.cpp */; };
 		F6F8E3C91EF846CE00F2DE8F /* worker_thread.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6F8E3C71EF846CE00F2DE8F /* worker_thread.hpp */; };
 /* End PBXBuildFile section */
@@ -153,13 +158,20 @@
 		3446C67F1DDCAA6E00146687 /* ref_counted_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ref_counted_tests.cpp; sourceTree = "<group>"; };
 		34BA2D6A1DBE169E00FAB345 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
 		34BA2D6B1DBE169E00FAB345 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
+		3917FA52211E008C00937DF4 /* clustering_map.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = clustering_map.hpp; sourceTree = "<group>"; };
+		3917FA54211E009700937DF4 /* geo_object_id.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geo_object_id.cpp; sourceTree = "<group>"; };
+		3917FA55211E009700937DF4 /* geo_object_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = geo_object_id.hpp; sourceTree = "<group>"; };
+		3917FA56211E009700937DF4 /* get_time.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = get_time.hpp; sourceTree = "<group>"; };
+		3917FA5A211E00BA00937DF4 /* pprof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pprof.cpp; sourceTree = "<group>"; };
+		3917FA5B211E00BB00937DF4 /* pprof.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pprof.hpp; sourceTree = "<group>"; };
+		3917FA5E211E00C300937DF4 /* suffix_array.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = suffix_array.hpp; sourceTree = "<group>"; };
+		3917FA60211E00F100937DF4 /* geo_object_id_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geo_object_id_tests.cpp; sourceTree = "<group>"; };
 		39B89C391FD1898A001104AF /* control_flow_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = control_flow_tests.cpp; sourceTree = "<group>"; };
 		39BC0FCF1FD057F900B6C276 /* control_flow.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = control_flow.hpp; sourceTree = "<group>"; };
 		39BC707420F55B6700A6EC20 /* clustering_map_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = clustering_map_tests.cpp; sourceTree = "<group>"; };
 		39BC707520F55B6700A6EC20 /* bwt_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bwt_tests.cpp; sourceTree = "<group>"; };
 		39F995DE20F55B8A0034F977 /* worker_thread_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worker_thread_tests.cpp; sourceTree = "<group>"; };
 		39F995DF20F55B8A0034F977 /* move_to_front_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = move_to_front_tests.cpp; sourceTree = "<group>"; };
-		39F995E020F55B8A0034F977 /* osm_id_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_id_test.cpp; sourceTree = "<group>"; };
 		39F995E120F55B8A0034F977 /* suffix_array_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = suffix_array_tests.cpp; sourceTree = "<group>"; };
 		39F995E220F55B8A0034F977 /* visitor_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = visitor_tests.cpp; sourceTree = "<group>"; };
 		39FD26C81CC65A0E00AFF551 /* assert_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = assert_test.cpp; sourceTree = "<group>"; };
@@ -209,8 +221,6 @@
 		56B1A0711E69DE4D00395022 /* random.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = random.cpp; sourceTree = "<group>"; };
 		56B1A0721E69DE4D00395022 /* random.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = random.hpp; sourceTree = "<group>"; };
 		56B1A0731E69DE4D00395022 /* small_set.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = small_set.hpp; sourceTree = "<group>"; };
-		56DE23021FCD8AB3008FEFD5 /* osm_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_id.hpp; sourceTree = "<group>"; };
-		56DE23031FCD8AB4008FEFD5 /* osm_id.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_id.cpp; sourceTree = "<group>"; };
 		670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sunrise_sunset.cpp; sourceTree = "<group>"; };
 		670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = sunrise_sunset.hpp; sourceTree = "<group>"; };
 		671182EE1C807C0A00CB8177 /* gmtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gmtime.cpp; sourceTree = "<group>"; };
@@ -306,8 +316,8 @@
 		39FD26C71CC659D200AFF551 /* base_tests */ = {
 			isa = PBXGroup;
 			children = (
+				3917FA60211E00F100937DF4 /* geo_object_id_tests.cpp */,
 				39F995DF20F55B8A0034F977 /* move_to_front_tests.cpp */,
-				39F995E020F55B8A0034F977 /* osm_id_test.cpp */,
 				39F995E120F55B8A0034F977 /* suffix_array_tests.cpp */,
 				39F995E220F55B8A0034F977 /* visitor_tests.cpp */,
 				39F995DE20F55B8A0034F977 /* worker_thread_tests.cpp */,
@@ -376,6 +386,13 @@
 		675341791A3F57BF00A0A8C3 /* base */ = {
 			isa = PBXGroup;
 			children = (
+				3917FA5E211E00C300937DF4 /* suffix_array.hpp */,
+				3917FA5A211E00BA00937DF4 /* pprof.cpp */,
+				3917FA5B211E00BB00937DF4 /* pprof.hpp */,
+				3917FA54211E009700937DF4 /* geo_object_id.cpp */,
+				3917FA55211E009700937DF4 /* geo_object_id.hpp */,
+				3917FA56211E009700937DF4 /* get_time.hpp */,
+				3917FA52211E008C00937DF4 /* clustering_map.hpp */,
 				564BB444206E89ED00BDD211 /* fifo_cache.hpp */,
 				675341851A3F57E400A0A8C3 /* array_adapters.hpp */,
 				675341861A3F57E400A0A8C3 /* assert.hpp */,
@@ -416,8 +433,6 @@
 				672DD4B61E04255F0078E13C /* newtype.hpp */,
 				675341A21A3F57E400A0A8C3 /* normalize_unicode.cpp */,
 				672DD4B71E04255F0078E13C /* observer_list.hpp */,
-				56DE23031FCD8AB4008FEFD5 /* osm_id.cpp */,
-				56DE23021FCD8AB3008FEFD5 /* osm_id.hpp */,
 				56B1A0711E69DE4D00395022 /* random.cpp */,
 				56B1A0721E69DE4D00395022 /* random.hpp */,
 				672DD4B81E0425600078E13C /* range_iterator.hpp */,
@@ -499,7 +514,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				3D74EF121F8B902C0081202C /* visitor.hpp in Headers */,
-				56DE23041FCD8AB4008FEFD5 /* osm_id.hpp in Headers */,
 				675341CF1A3F57E400A0A8C3 /* bits.hpp in Headers */,
 				672DD4C71E0425600078E13C /* ref_counted.hpp in Headers */,
 				675341E61A3F57E400A0A8C3 /* mutex.hpp in Headers */,
@@ -524,10 +538,13 @@
 				675342001A3F57E400A0A8C3 /* string_format.hpp in Headers */,
 				675341F41A3F57E400A0A8C3 /* scope_guard.hpp in Headers */,
 				672DD4BF1E0425600078E13C /* collection_cast.hpp in Headers */,
+				3917FA5F211E00C400937DF4 /* suffix_array.hpp in Headers */,
+				3917FA53211E008C00937DF4 /* clustering_map.hpp in Headers */,
 				3D3731FF1F9A445500D2121B /* url_helpers.hpp in Headers */,
 				675342071A3F57E400A0A8C3 /* thread_pool.hpp in Headers */,
 				3446C6711DDCA96300146687 /* dfa_helpers.hpp in Headers */,
 				6753420C1A3F57E400A0A8C3 /* threaded_list.hpp in Headers */,
+				3917FA59211E009700937DF4 /* get_time.hpp in Headers */,
 				675341DB1A3F57E400A0A8C3 /* exception.hpp in Headers */,
 				6753453E1A3F6F6A00A0A8C3 /* message.hpp in Headers */,
 				39BC0FD01FD057FA00B6C276 /* control_flow.hpp in Headers */,
@@ -547,6 +564,7 @@
 				675341F71A3F57E400A0A8C3 /* shared_buffer_manager.hpp in Headers */,
 				56B1A0761E69DE4D00395022 /* small_set.hpp in Headers */,
 				67B52B611AD3C84E00664C17 /* thread_checker.hpp in Headers */,
+				3917FA5D211E00BB00937DF4 /* pprof.hpp in Headers */,
 				672DD4BE1E0425600078E13C /* cancellable.hpp in Headers */,
 				675341CB1A3F57E400A0A8C3 /* array_adapters.hpp in Headers */,
 				3446C6751DDCA96300146687 /* uni_string_dfa.hpp in Headers */,
@@ -556,6 +574,7 @@
 				564BB445206E89ED00BDD211 /* fifo_cache.hpp in Headers */,
 				672DD4C31E0425600078E13C /* mem_trie.hpp in Headers */,
 				672DD4C61E0425600078E13C /* range_iterator.hpp in Headers */,
+				3917FA58211E009700937DF4 /* geo_object_id.hpp in Headers */,
 				F6F8E3C91EF846CE00F2DE8F /* worker_thread.hpp in Headers */,
 				675341FD1A3F57E400A0A8C3 /* stl_add.hpp in Headers */,
 			);
@@ -650,29 +669,39 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3917FA6B211E010400937DF4 /* small_set_test.cpp in Sources */,
 				39FD27341CC65AD000AFF551 /* sunrise_sunset_test.cpp in Sources */,
 				39FD27351CC65AD000AFF551 /* thread_pool_tests.cpp in Sources */,
 				39FD271E1CC65AD000AFF551 /* testingmain.cpp in Sources */,
 				39FD27391CC65AD000AFF551 /* timer_test.cpp in Sources */,
 				39FD27201CC65AD000AFF551 /* bits_test.cpp in Sources */,
 				3446C67D1DDCAA4900146687 /* uni_string_dfa_test.cpp in Sources */,
+				3917FA68211E010400937DF4 /* clustering_map_tests.cpp in Sources */,
+				3917FA65211E010400937DF4 /* visitor_tests.cpp in Sources */,
+				3917FA66211E010400937DF4 /* worker_thread_tests.cpp in Sources */,
+				3917FA6A211E010400937DF4 /* control_flow_tests.cpp in Sources */,
 				39FD27321CC65AD000AFF551 /* string_format_test.cpp in Sources */,
 				39FD272A1CC65AD000AFF551 /* mem_trie_test.cpp in Sources */,
 				3446C67C1DDCAA4600146687 /* levenshtein_dfa_test.cpp in Sources */,
+				3917FA69211E010400937DF4 /* fifo_cache_test.cpp in Sources */,
 				39FD27381CC65AD000AFF551 /* timegm_test.cpp in Sources */,
 				39FD272C1CC65AD000AFF551 /* range_iterator_test.cpp in Sources */,
 				39FD27261CC65AD000AFF551 /* containers_test.cpp in Sources */,
+				3917FA67211E010400937DF4 /* bwt_tests.cpp in Sources */,
 				3446C6821DDCAA7400146687 /* newtype_test.cpp in Sources */,
 				39FD27231CC65AD000AFF551 /* collection_cast_test.cpp in Sources */,
 				39FD27301CC65AD000AFF551 /* stl_add_test.cpp in Sources */,
 				39FD272E1CC65AD000AFF551 /* rolling_hash_test.cpp in Sources */,
 				39FD27361CC65AD000AFF551 /* threaded_list_test.cpp in Sources */,
+				3917FA63211E010400937DF4 /* move_to_front_tests.cpp in Sources */,
 				39FD272B1CC65AD000AFF551 /* observer_list_test.cpp in Sources */,
 				39FD27371CC65AD000AFF551 /* threads_test.cpp in Sources */,
 				39FD27331CC65AD000AFF551 /* string_utils_test.cpp in Sources */,
 				39FD27311CC65AD000AFF551 /* stl_helpers_test.cpp in Sources */,
 				3446C6831DDCAA7800146687 /* ref_counted_tests.cpp in Sources */,
 				39FD27211CC65AD000AFF551 /* buffer_vector_test.cpp in Sources */,
+				3917FA64211E010400937DF4 /* suffix_array_tests.cpp in Sources */,
+				3917FA62211E010400937DF4 /* geo_object_id_tests.cpp in Sources */,
 				39FD27241CC65AD000AFF551 /* condition_test.cpp in Sources */,
 				39FD27221CC65AD000AFF551 /* cache_test.cpp in Sources */,
 				39FD272D1CC65AD000AFF551 /* regexp_test.cpp in Sources */,
@@ -694,29 +723,23 @@
 				675342081A3F57E400A0A8C3 /* thread.cpp in Sources */,
 				675342061A3F57E400A0A8C3 /* thread_pool.cpp in Sources */,
 				670E39441C46C76900E9C0A6 /* sunrise_sunset.cpp in Sources */,
-				67E40EC81E4DC0D500A6D200 /* small_set_test.cpp in Sources */,
-				39F995E320F55B8A0034F977 /* worker_thread_tests.cpp in Sources */,
-				56DE23051FCD8AB4008FEFD5 /* osm_id.cpp in Sources */,
 				6753420E1A3F57E400A0A8C3 /* timer.cpp in Sources */,
-				39F995E520F55B8A0034F977 /* osm_id_test.cpp in Sources */,
 				675341F61A3F57E400A0A8C3 /* shared_buffer_manager.cpp in Sources */,
-				39F995E420F55B8A0034F977 /* move_to_front_tests.cpp in Sources */,
 				56B1A0741E69DE4D00395022 /* random.cpp in Sources */,
 				675341DA1A3F57E400A0A8C3 /* exception.cpp in Sources */,
 				3D74EF111F8B902C0081202C /* suffix_array.cpp in Sources */,
+				3917FA57211E009700937DF4 /* geo_object_id.cpp in Sources */,
 				F6F8E3C81EF846CE00F2DE8F /* worker_thread.cpp in Sources */,
 				3D3731FE1F9A445500D2121B /* url_helpers.cpp in Sources */,
 				675341F91A3F57E400A0A8C3 /* src_point.cpp in Sources */,
 				675342031A3F57E400A0A8C3 /* strings_bundle.cpp in Sources */,
-				39B89C3A1FD1898A001104AF /* control_flow_tests.cpp in Sources */,
-				564BB447206E8A4D00BDD211 /* fifo_cache_test.cpp in Sources */,
 				3D74EF141F8B902C0081202C /* bwt.cpp in Sources */,
 				3D74EF131F8B902C0081202C /* move_to_front.cpp in Sources */,
-				39F995E620F55B8A0034F977 /* suffix_array_tests.cpp in Sources */,
 				675341CD1A3F57E400A0A8C3 /* base.cpp in Sources */,
 				675342011A3F57E400A0A8C3 /* string_utils.cpp in Sources */,
 				674A7E2E1C0DB03D003D48E1 /* timegm.cpp in Sources */,
 				6753420A1A3F57E400A0A8C3 /* threaded_container.cpp in Sources */,
+				3917FA5C211E00BB00937DF4 /* pprof.cpp in Sources */,
 				675341FF1A3F57E400A0A8C3 /* string_format.cpp in Sources */,
 				67A609AE1C88642E001E641A /* deferred_task.cpp in Sources */,
 				675341DF1A3F57E400A0A8C3 /* logging.cpp in Sources */,
@@ -724,10 +747,7 @@
 				67B52B601AD3C84E00664C17 /* thread_checker.cpp in Sources */,
 				675341E71A3F57E400A0A8C3 /* normalize_unicode.cpp in Sources */,
 				675341E11A3F57E400A0A8C3 /* lower_case.cpp in Sources */,
-				39F995E720F55B8A0034F977 /* visitor_tests.cpp in Sources */,
-				39BC707620F55B6700A6EC20 /* clustering_map_tests.cpp in Sources */,
 				672DD4C11E0425600078E13C /* condition.cpp in Sources */,
-				39BC707720F55B6700A6EC20 /* bwt_tests.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};