From 20c0eb77e37e8148e37ca50edb3b6c5bab160198 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Sat, 17 Dec 2016 00:42:38 +0300 Subject: [PATCH] Remove using std from base --- 3party/jansson/myjansson.hpp | 1 + 3party/sdf_image/sdf_image.cpp | 1 + base/CMakeLists.txt | 10 - base/SRC_FIRST.hpp | 2 - base/assert.hpp | 4 +- base/base.cpp | 10 +- base/base.hpp | 2 +- base/base.pro | 7 - base/base_tests/CMakeLists.txt | 2 - base/base_tests/assert_test.cpp | 1 - base/base_tests/base_tests.pro | 2 - base/base_tests/bits_test.cpp | 3 +- base/base_tests/buffer_vector_test.cpp | 16 +- base/base_tests/cache_test.cpp | 22 +- base/base_tests/condition_test.cpp | 7 +- base/base_tests/const_helper.cpp | 23 -- base/base_tests/containers_test.cpp | 1 - base/base_tests/logging_test.cpp | 1 - base/base_tests/ref_counted_tests.cpp | 2 +- base/base_tests/regexp_test.cpp | 12 +- base/base_tests/rolling_hash_test.cpp | 2 +- base/base_tests/scope_guard_test.cpp | 1 - base/base_tests/stl_add_test.cpp | 16 +- base/base_tests/string_utils_test.cpp | 10 +- base/base_tests/threaded_list_test.cpp | 87 +----- base/base_tests/threads_test.cpp | 7 +- base/base_tests/worker_thread_test.cpp | 50 --- base/bits.hpp | 18 +- base/buffer_vector.hpp | 55 ++-- base/cache.hpp | 10 +- base/cancellable.hpp | 4 +- base/condition.cpp | 90 +++++- base/condition_bada.cpp | 54 ---- base/condition_posix.cpp | 89 ------ base/condition_windows_native.cpp | 291 ------------------ base/const_helper.hpp | 13 - base/deferred_task.cpp | 8 +- base/deferred_task.hpp | 18 +- base/dfa_helpers.hpp | 4 +- base/exception.cpp | 6 +- base/exception.hpp | 12 +- base/gmtime.hpp | 2 +- base/internal/message.cpp | 2 +- base/internal/message.hpp | 124 ++++---- base/levenshtein_dfa.cpp | 30 +- base/levenshtein_dfa.hpp | 20 +- base/limited_priority_queue.hpp | 12 +- base/logging.cpp | 34 +- base/logging.hpp | 10 +- base/math.hpp | 26 +- base/matrix.hpp | 18 +- base/mem_trie.hpp | 12 +- base/newtype.hpp | 8 +- base/object_tracker.cpp | 81 ----- base/object_tracker.hpp | 35 --- base/observer_list.hpp | 16 +- base/range_iterator.hpp | 4 +- base/ref_counted.hpp | 10 +- base/set_operations.hpp | 4 +- base/shared_buffer_manager.cpp | 2 +- base/shared_buffer_manager.hpp | 17 +- base/src_point.cpp | 10 +- base/src_point.hpp | 4 +- base/stats.hpp | 8 +- base/std_serialization.hpp | 44 +-- base/stl_add.hpp | 26 +- base/stl_helpers.hpp | 14 +- base/stl_iterator.hpp | 4 +- base/string_format.cpp | 12 +- base/string_format.hpp | 30 +- base/string_utils.cpp | 87 +++--- base/string_utils.hpp | 142 ++++----- base/strings_bundle.cpp | 6 +- base/strings_bundle.hpp | 12 +- base/sunrise_sunset.cpp | 10 +- base/sunrise_sunset.hpp | 6 +- base/swap.hpp | 11 - base/thread.cpp | 22 +- base/thread.hpp | 42 +-- base/thread_checker.cpp | 4 +- base/thread_checker.hpp | 4 +- base/thread_pool.cpp | 19 +- base/thread_pool.hpp | 4 +- base/threaded_list.hpp | 10 +- base/threaded_priority_queue.hpp | 83 ----- base/time_samples.cpp | 24 -- base/time_samples.hpp | 49 --- base/timegm.cpp | 2 +- base/timegm.hpp | 4 +- base/timer.cpp | 45 +-- base/timer.hpp | 26 +- base/uni_string_dfa.cpp | 2 +- base/uni_string_dfa.hpp | 4 +- base/worker_thread.hpp | 113 ------- coding/coding_tests/coder_util_test.cpp | 1 - coding/coding_tests/mem_file_reader_test.cpp | 1 - coding/coding_tests/mem_file_writer_test.cpp | 1 - coding/coding_tests/png_decoder_test.cpp | 1 + .../coding_tests/reader_writer_ops_test.cpp | 2 - coding/diff.hpp | 3 + coding/file_container.cpp | 1 + coding/file_container.hpp | 1 + coding/fixed_bits_ddvector.hpp | 1 + coding/multilang_utf8_string.hpp | 1 + coding/parse_xml.hpp | 2 + coding/read_write_utils.hpp | 1 + coding/reader_cache.hpp | 5 +- coding/varint.hpp | 2 + coding/zip_reader.hpp | 1 + drape/attribute_buffer_mutator.hpp | 1 + drape/batcher_helpers.hpp | 1 + drape/drape_tests/fribidi_tests.cpp | 1 - drape/glfunctions.cpp | 5 +- drape/glsl_types.hpp | 2 + drape/glyph_manager.cpp | 2 + drape/overlay_handle.hpp | 2 + drape/pointers.hpp | 4 + drape/render_bucket.hpp | 1 + drape/shader.cpp | 2 + drape/stipple_pen_resource.cpp | 1 + drape/support_manager.cpp | 1 + drape/symbols_texture.hpp | 1 + drape/utils/glyph_usage_tracker.hpp | 1 + drape/utils/gpu_mem_tracker.hpp | 3 + .../animation/base_interpolator.cpp | 2 + .../animation/parallel_animation.hpp | 2 + drape_frontend/animation_system.cpp | 1 + drape_frontend/animation_system.hpp | 1 + .../object_pool_tests.cpp | 1 - drape_frontend/frontend_renderer.cpp | 1 + drape_frontend/gui/skin.hpp | 1 + drape_frontend/map_shape.hpp | 2 + drape_frontend/message_queue.hpp | 1 + drape_frontend/read_manager.cpp | 3 +- drape_frontend/read_mwm_task.hpp | 5 - drape_frontend/text_layout.cpp | 4 +- drape_frontend/tile_utils.hpp | 1 + drape_frontend/user_event_stream.cpp | 2 + drape_frontend/visual_params.cpp | 3 +- drape_frontend/watch/feature_processor.hpp | 2 + drape_frontend/watch/pen_info.hpp | 3 + drape_frontend/watch/proto_to_styles.cpp | 1 + drape_frontend/watch/software_renderer.hpp | 2 + drape_frontend/watch/text_engine.h | 3 + editor/config_loader.cpp | 3 +- editor/editor_notes.cpp | 1 + editor/editor_tests/ui2oh_test.cpp | 2 + editor/opening_hours_ui.cpp | 2 +- editor/osm_feature_matcher.cpp | 1 + generator/booking_dataset.cpp | 2 + generator/feature_builder.hpp | 1 + generator/feature_merger.hpp | 1 + .../generator_tests/osm_o5m_source_test.cpp | 3 + .../source_to_element_test.cpp | 2 + generator/intermediate_data.hpp | 1 + generator/intermediate_elements.hpp | 2 + generator/opentable_dataset.cpp | 2 + generator/osm2type.cpp | 5 +- generator/osm_element.cpp | 4 +- generator/osm_o5m_source.hpp | 1 + generator/osm_source.hpp | 1 + generator/tag_admixer.hpp | 2 + generator/tesselator.cpp | 1 + generator/tesselator.hpp | 3 +- geometry/algorithm.hpp | 1 + geometry/angles.hpp | 1 + geometry/avg_vector.hpp | 2 + geometry/geometry_tests/angle_test.cpp | 2 - geometry/geometry_tests/cellid_test.cpp | 1 + geometry/geometry_tests/clipping_test.cpp | 2 + geometry/geometry_tests/common_test.cpp | 1 - geometry/geometry_tests/intersect_test.cpp | 2 - geometry/geometry_tests/mercator_test.cpp | 2 - geometry/geometry_tests/packer_test.cpp | 1 - geometry/geometry_tests/rect_test.cpp | 1 - .../region2d_binary_op_test.cpp | 2 - geometry/geometry_tests/robust_test.cpp | 1 + geometry/geometry_tests/spline_test.cpp | 1 - .../geometry_tests/transformations_test.cpp | 2 - geometry/packer.hpp | 2 + geometry/point2d.hpp | 8 +- geometry/polygon.hpp | 1 + geometry/rect2d.hpp | 1 + geometry/robust_orientation.cpp | 4 +- geometry/robust_orientation.hpp | 2 + geometry/tree4d.hpp | 1 + indexer/banners.cpp | 2 + indexer/categories_holder.hpp | 1 + indexer/data_header.hpp | 2 + indexer/editable_map_object.cpp | 1 + indexer/feature.hpp | 1 + indexer/feature_impl.cpp | 1 + indexer/feature_loader.cpp | 2 - indexer/feature_loader_base.cpp | 2 - indexer/geometry_serialization.hpp | 7 +- indexer/indexer_tests/categories_test.cpp | 1 + .../search_string_utils_test.cpp | 2 + indexer/indexer_tests/string_slice_tests.cpp | 2 + indexer/indexer_tests/test_type.cpp | 2 - indexer/indexer_tests/visibility_test.cpp | 1 + indexer/mwm_set.cpp | 1 + indexer/old/feature_loader_101.cpp | 2 - indexer/rank_table.cpp | 1 + indexer/search_delimiters.hpp | 2 + indexer/search_string_utils.hpp | 3 + indexer/trie.hpp | 1 - indexer/trie_builder.hpp | 1 + .../Login/MWMAuthorizationCommon.mm | 2 +- .../MWMAuthorizationOSMLoginViewController.mm | 2 +- ...AuthorizationWebViewLoginViewController.mm | 4 +- .../Maps/Common/Statistics/fabric_logging.hpp | 4 +- .../Common/Statistics/fabric_logging_ios.mm | 6 +- .../OpeningHours/MWMOpeningHoursModel.mm | 2 +- map/feature_vec_model.cpp | 2 - map/gps_track.cpp | 2 + map/mwm_url.hpp | 1 + mapshot/mapshot.cpp | 2 + partners_api/uber_api.cpp | 1 + platform/file_logging.cpp | 2 + platform/file_logging.hpp | 2 + platform/http_client.hpp | 1 + platform/http_request.cpp | 1 + platform/platform_tests/measurement_tests.cpp | 2 + .../platform_tests_support/test_socket.hpp | 1 + platform/preferred_languages.cpp | 1 + qt/main.cpp | 3 - qt/osm_auth_dialog.cpp | 2 +- qt/proxystyle.cpp | 2 - qt/qtoglcontext.cpp | 2 +- qt/slider_ctrl.cpp | 2 - routing/routing_serialization.cpp | 2 + routing/turns.cpp | 1 + routing/turns_notification_manager.cpp | 2 + routing/turns_sound_settings.hpp | 1 + routing/turns_tts_text.cpp | 1 + search/cancel_exception.hpp | 2 + search/geocoder.cpp | 3 +- search/house_detector.cpp | 1 + search/house_numbers_matcher.hpp | 1 + search/intermediate_result.hpp | 2 + search/keyword_lang_matcher.cpp | 2 + search/keyword_lang_matcher.hpp | 1 + search/keyword_matcher.cpp | 1 + search/string_intersection.hpp | 2 + storage/country.hpp | 1 + storage/country_tree.hpp | 1 + storage/storage_tests/storage_tests.cpp | 1 + tracking/connection.cpp | 4 +- tracking/protocol.cpp | 1 + tracking/protocol.hpp | 2 +- tracking/reporter.hpp | 2 + xcode/base/base.xcodeproj/project.pbxproj | 88 +++--- 252 files changed, 957 insertions(+), 1750 deletions(-) delete mode 100644 base/SRC_FIRST.hpp delete mode 100644 base/base_tests/const_helper.cpp delete mode 100644 base/base_tests/worker_thread_test.cpp delete mode 100644 base/condition_bada.cpp delete mode 100644 base/condition_posix.cpp delete mode 100644 base/condition_windows_native.cpp delete mode 100644 base/const_helper.hpp delete mode 100644 base/object_tracker.cpp delete mode 100644 base/object_tracker.hpp delete mode 100644 base/swap.hpp delete mode 100644 base/threaded_priority_queue.hpp delete mode 100644 base/time_samples.cpp delete mode 100644 base/time_samples.hpp delete mode 100644 base/worker_thread.hpp diff --git a/3party/jansson/myjansson.hpp b/3party/jansson/myjansson.hpp index f2d57085d9..a86687232a 100644 --- a/3party/jansson/myjansson.hpp +++ b/3party/jansson/myjansson.hpp @@ -7,6 +7,7 @@ #include "3party/jansson/src/jansson.h" +#include "std/string.hpp" #include "std/vector.hpp" namespace my diff --git a/3party/sdf_image/sdf_image.cpp b/3party/sdf_image/sdf_image.cpp index 912a0185ad..f0192b08ed 100644 --- a/3party/sdf_image/sdf_image.cpp +++ b/3party/sdf_image/sdf_image.cpp @@ -22,6 +22,7 @@ THE SOFTWARE. #include "base/math.hpp" #include "base/scope_guard.hpp" +#include "std/algorithm.hpp" #include "std/limits.hpp" #include "std/bind.hpp" diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index e71d7f4a6b..70b0832656 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -2,7 +2,6 @@ project(base) set( SRC - SRC_FIRST.hpp array_adapters.hpp assert.hpp base.cpp @@ -14,10 +13,6 @@ set( collection_cast.hpp condition.cpp condition.hpp -# condition_bada.cpp - condition_posix.cpp -# condition_windows_native.cpp - const_helper.hpp deferred_task.cpp deferred_task.hpp dfa_helpers.hpp @@ -38,8 +33,6 @@ set( mutex.hpp newtype.hpp normalize_unicode.cpp - object_tracker.cpp - object_tracker.hpp observer_list.hpp range_iterator.hpp ref_counted.hpp @@ -63,7 +56,6 @@ set( strings_bundle.hpp sunrise_sunset.cpp sunrise_sunset.hpp - swap.hpp thread.cpp thread.hpp thread_checker.cpp @@ -73,7 +65,6 @@ set( threaded_container.cpp threaded_container.hpp threaded_list.hpp - threaded_priority_queue.hpp internal/message.cpp internal/message.hpp timegm.cpp @@ -82,7 +73,6 @@ set( timer.hpp uni_string_dfa.cpp uni_string_dfa.hpp - worker_thread.hpp ) add_library(${PROJECT_NAME} ${SRC}) diff --git a/base/SRC_FIRST.hpp b/base/SRC_FIRST.hpp deleted file mode 100644 index b948f256c9..0000000000 --- a/base/SRC_FIRST.hpp +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "base/base.hpp" diff --git a/base/assert.hpp b/base/assert.hpp index de51536c67..d4f73c44d6 100644 --- a/base/assert.hpp +++ b/base/assert.hpp @@ -3,13 +3,13 @@ #include "base/internal/message.hpp" #include "base/src_point.hpp" -#include "std/string.hpp" +#include namespace my { // Called when ASSERT, CHECK or VERIFY failed. - typedef void (*AssertFailedFn)(SrcPoint const &, string const &); + typedef void (*AssertFailedFn)(SrcPoint const &, std::string const &); extern AssertFailedFn OnAssertFailed; /// @return Pointer to previous message function. diff --git a/base/base.cpp b/base/base.cpp index dc93a19ea2..53d5c522f5 100644 --- a/base/base.cpp +++ b/base/base.cpp @@ -3,19 +3,19 @@ #include "base/exception.hpp" #include "std/target_os.hpp" -#include "std/iostream.hpp" +#include #include #include namespace my { - void OnAssertFailedDefault(SrcPoint const & srcPoint, string const & msg) + void OnAssertFailedDefault(SrcPoint const & srcPoint, std::string const & msg) { - std::cerr << "ASSERT FAILED" << endl - << srcPoint.FileName() << ":" << srcPoint.Line() << endl - << msg << endl; + std::cerr << "ASSERT FAILED" << std::endl + << srcPoint.FileName() << ":" << srcPoint.Line() << std::endl + << msg << std::endl; #ifdef DEBUG assert(false); diff --git a/base/base.hpp b/base/base.hpp index 550dd538d6..e8543cb02e 100644 --- a/base/base.hpp +++ b/base/base.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/cstdint.hpp" +#include #if defined(DEBUG) || defined(_DEBUG) || defined(NRELEASE) #define MY_DEBUG_DEFINED 1 diff --git a/base/base.pro b/base/base.pro index 31f3f5bd88..aa42754cc5 100644 --- a/base/base.pro +++ b/base/base.pro @@ -18,7 +18,6 @@ SOURCES += \ logging.cpp \ lower_case.cpp \ normalize_unicode.cpp \ - object_tracker.cpp \ shared_buffer_manager.cpp \ src_point.cpp \ string_format.cpp \ @@ -29,7 +28,6 @@ SOURCES += \ thread_checker.cpp \ thread_pool.cpp \ threaded_container.cpp \ - time_samples.cpp \ timegm.cpp \ timer.cpp \ uni_string_dfa.cpp \ @@ -45,7 +43,6 @@ HEADERS += \ cancellable.hpp \ collection_cast.hpp \ condition.hpp \ - const_helper.hpp \ deferred_task.hpp \ dfa_helpers.hpp \ exception.hpp \ @@ -60,7 +57,6 @@ HEADERS += \ mem_trie.hpp \ mutex.hpp \ newtype.hpp \ - object_tracker.hpp \ observer_list.hpp \ range_iterator.hpp \ ref_counted.hpp \ @@ -79,15 +75,12 @@ HEADERS += \ string_utils.hpp \ strings_bundle.hpp \ sunrise_sunset.hpp \ - swap.hpp \ thread.hpp \ thread_checker.hpp \ thread_pool.hpp \ threaded_container.hpp \ threaded_list.hpp \ threaded_priority_queue.hpp \ - time_samples.hpp \ timegm.hpp \ timer.hpp \ uni_string_dfa.hpp \ - worker_thread.hpp \ diff --git a/base/base_tests/CMakeLists.txt b/base/base_tests/CMakeLists.txt index 0fa0ec6b3e..7d3106daaa 100644 --- a/base/base_tests/CMakeLists.txt +++ b/base/base_tests/CMakeLists.txt @@ -10,7 +10,6 @@ set( cache_test.cpp collection_cast_test.cpp condition_test.cpp - const_helper.cpp containers_test.cpp levenshtein_dfa_test.cpp logging_test.cpp @@ -35,7 +34,6 @@ set( timegm_test.cpp timer_test.cpp uni_string_dfa_test.cpp - worker_thread_test.cpp ) omim_add_test(${PROJECT_NAME} ${SRC}) diff --git a/base/base_tests/assert_test.cpp b/base/base_tests/assert_test.cpp index 7056d244d7..0df32cc5df 100644 --- a/base/base_tests/assert_test.cpp +++ b/base/base_tests/assert_test.cpp @@ -1,4 +1,3 @@ -#include "base/SRC_FIRST.hpp" #include "testing/testing.hpp" #include "base/base.hpp" diff --git a/base/base_tests/base_tests.pro b/base/base_tests/base_tests.pro index c8708b84d4..32049b5282 100644 --- a/base/base_tests/base_tests.pro +++ b/base/base_tests/base_tests.pro @@ -20,7 +20,6 @@ SOURCES += \ cache_test.cpp \ collection_cast_test.cpp \ condition_test.cpp \ - const_helper.cpp \ containers_test.cpp \ levenshtein_dfa_test.cpp \ logging_test.cpp \ @@ -45,6 +44,5 @@ SOURCES += \ timegm_test.cpp \ timer_test.cpp \ uni_string_dfa_test.cpp \ - worker_thread_test.cpp \ HEADERS += diff --git a/base/base_tests/bits_test.cpp b/base/base_tests/bits_test.cpp index bded2a18ec..c7184b6055 100644 --- a/base/base_tests/bits_test.cpp +++ b/base/base_tests/bits_test.cpp @@ -1,4 +1,3 @@ -#include "base/SRC_FIRST.hpp" #include "testing/testing.hpp" #include "base/bits.hpp" @@ -29,7 +28,7 @@ UNIT_TEST(PopcountArray32) { for (uint32_t j = 0; j < 2777; ++j) { - vector v(j / 10); + std::vector v(j / 10); for (size_t i = 0; i < v.size(); ++i) v[i] = ((uint32_t(rand()) & 255) << 24) + ((rand() & 255) << 16) + ((rand() & 255) << 8) + (rand() & 255); diff --git a/base/base_tests/buffer_vector_test.cpp b/base/base_tests/buffer_vector_test.cpp index 96a0a62a25..f9fd8f8130 100644 --- a/base/base_tests/buffer_vector_test.cpp +++ b/base/base_tests/buffer_vector_test.cpp @@ -144,21 +144,21 @@ UNIT_TEST(BufferVectorInsert) for (size_t insertPos = 0; insertPos <= initialLength; ++insertPos) { buffer_vector b; - vector v; + std::vector v; for (size_t i = 0; i < initialLength; ++i) { b.push_back('A' + i); v.push_back('A' + i); } - vector dataToInsert(insertLength); + std::vector dataToInsert(insertLength); for (size_t i = 0; i < insertLength; ++i) dataToInsert[i] = 'a' + i; b.insert(b.begin() + insertPos, dataToInsert.begin(), dataToInsert.end()); v.insert(v.begin() + insertPos, dataToInsert.begin(), dataToInsert.end()); - vector result(b.begin(), b.end()); + std::vector result(b.begin(), b.end()); TEST_EQUAL(v, result, (initialLength, insertLength, insertPos)); } } @@ -202,21 +202,21 @@ UNIT_TEST(BufferVectorAppend) for (size_t insertLength = 0; insertLength < 20; ++insertLength) { buffer_vector b; - vector v; + std::vector v; for (size_t i = 0; i < initialLength; ++i) { b.push_back('A' + i); v.push_back('A' + i); } - vector dataToInsert(insertLength); + std::vector dataToInsert(insertLength); for (size_t i = 0; i < insertLength; ++i) dataToInsert[i] = 'a' + i; b.append(dataToInsert.begin(), dataToInsert.end()); v.insert(v.end(), dataToInsert.begin(), dataToInsert.end()); - vector result(b.begin(), b.end()); + std::vector result(b.begin(), b.end()); TEST_EQUAL(v, result, (initialLength, insertLength)); } } @@ -325,11 +325,11 @@ UNIT_TEST(BufferVectorMove) v1.emplace_back("2"); TestVector(v1, 3); - VectorT v2(move(v1)); + VectorT v2(std::move(v1)); TestVector(v2, 3); VectorT().swap(v1); - v1 = move(v2); + v1 = std::move(v2); TestVector(v1, 3); } diff --git a/base/base_tests/cache_test.cpp b/base/base_tests/cache_test.cpp index 0073c65e59..e9d8f2e65e 100644 --- a/base/base_tests/cache_test.cpp +++ b/base/base_tests/cache_test.cpp @@ -18,7 +18,7 @@ public: m_v.push_back(c); } - vector m_v; + std::vector m_v; private: DISALLOW_COPY(SimpleFunctor); @@ -28,7 +28,7 @@ private: class SimpleMovableFunctor { public: - SimpleMovableFunctor(vector * v) : m_v(v) {} + SimpleMovableFunctor(std::vector * v) : m_v(v) {} // movable SimpleMovableFunctor(SimpleMovableFunctor && other) @@ -43,7 +43,7 @@ public: } private: - vector * m_v; + std::vector * m_v; DISALLOW_COPY(SimpleMovableFunctor); }; @@ -85,9 +85,9 @@ UNIT_TEST(CacheSmoke_0) bool found = true; cache.Find(0, found); TEST(!found, ()); - vector v; + std::vector v; cache.ForEachValue(MakeBackInsertFunctor(v)); - TEST_EQUAL(v, vector(8, 0), ()); + TEST_EQUAL(v, std::vector(8, 0), ()); } UNIT_TEST(CacheSmoke_1) @@ -95,7 +95,7 @@ UNIT_TEST(CacheSmoke_1) my::Cache cache(3); // it contains 2^3=8 elements SimpleFunctor f; cache.ForEachValue(f); // f passed by reference - TEST_EQUAL(f.m_v, vector(8, 0), ()); + TEST_EQUAL(f.m_v, std::vector(8, 0), ()); } UNIT_TEST(CacheSmoke_2) @@ -103,7 +103,7 @@ UNIT_TEST(CacheSmoke_2) my::Cache cache(3); // it contains 2^3=8 elements SimpleFunctor f; cache.ForEachValue(ref(f)); // f passed by reference - TEST_EQUAL(f.m_v, vector(8, 0), ()); + TEST_EQUAL(f.m_v, std::vector(8, 0), ()); } UNIT_TEST(CacheSmoke_3) @@ -142,7 +142,7 @@ UNIT_TEST(CacheSmoke_4) my::CacheWithStat cache(3); // it contains 2^3=8 elements SimpleFunctor f; cache.ForEachValue(f); // f passed by reference - TEST_EQUAL(f.m_v, vector(8, 0), ()); + TEST_EQUAL(f.m_v, std::vector(8, 0), ()); } UNIT_TEST(CacheSmoke_5) @@ -150,15 +150,15 @@ UNIT_TEST(CacheSmoke_5) my::CacheWithStat cache(3); // it contains 2^3=8 elements SimpleFunctor f; cache.ForEachValue(ref(f)); // f passed by reference - TEST_EQUAL(f.m_v, vector(8, 0), ()); + TEST_EQUAL(f.m_v, std::vector(8, 0), ()); } UNIT_TEST(CacheSmoke_6) { my::CacheWithStat cache(3); // it contains 2^3=8 elements - vector v; + std::vector v; cache.ForEachValue(SimpleMovableFunctor(&v)); - TEST_EQUAL(v, vector(8, 0), ()); + TEST_EQUAL(v, std::vector(8, 0), ()); } UNIT_TEST(Cache_Init) diff --git a/base/base_tests/condition_test.cpp b/base/base_tests/condition_test.cpp index 45c8e6216c..b1e1b65739 100644 --- a/base/base_tests/condition_test.cpp +++ b/base/base_tests/condition_test.cpp @@ -1,11 +1,10 @@ -#include "base/SRC_FIRST.hpp" #include "testing/testing.hpp" #include "base/thread.hpp" #include "base/threaded_list.hpp" #include "base/condition.hpp" - #include "base/logging.hpp" +#include "base/stl_add.hpp" struct ConditionThread : public threads::IRoutine { @@ -25,10 +24,10 @@ UNIT_TEST(Condition_Test) ThreadedList l; threads::Thread t0; - t0.Create(make_unique(&l)); + t0.Create(my::make_unique(&l)); threads::Thread t1; - t1.Create(make_unique(&l)); + t1.Create(my::make_unique(&l)); l.Cancel(); t0.Join(); diff --git a/base/base_tests/const_helper.cpp b/base/base_tests/const_helper.cpp deleted file mode 100644 index b46ce9dc93..0000000000 --- a/base/base_tests/const_helper.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "base/SRC_FIRST.hpp" -#include "testing/testing.hpp" - -#include "base/const_helper.hpp" -#include "std/typeinfo.hpp" - -UNIT_TEST(ConstHelper) -{ - TEST_EQUAL(typeid(my::PropagateConst::type *).name(), typeid(char *).name(), ()); - TEST_EQUAL(typeid(my::PropagateConst::type *).name(), typeid(void *).name(), ()); - TEST_EQUAL(typeid(my::PropagateConst::type *).name(), - typeid(char const *).name(), ()); - TEST_EQUAL(typeid(my::PropagateConst::type *).name(), - typeid(void const *).name(), ()); - TEST_EQUAL(typeid(my::PropagateConst::type *).name(), - typeid(char const *).name(), ()); - TEST_EQUAL(typeid(my::PropagateConst::type *).name(), - typeid(void const *).name(), ()); - TEST_EQUAL(typeid(my::PropagateConst::type *).name(), - typeid(char const *).name(), ()); - TEST_EQUAL(typeid(my::PropagateConst::type *).name(), - typeid(void const *).name(), ()); -} diff --git a/base/base_tests/containers_test.cpp b/base/base_tests/containers_test.cpp index 1ed3e807ab..577cdfd24b 100644 --- a/base/base_tests/containers_test.cpp +++ b/base/base_tests/containers_test.cpp @@ -1,4 +1,3 @@ -#include "base/SRC_FIRST.hpp" #include "testing/testing.hpp" #include "base/limited_priority_queue.hpp" diff --git a/base/base_tests/logging_test.cpp b/base/base_tests/logging_test.cpp index b3776da773..cb6439ef18 100644 --- a/base/base_tests/logging_test.cpp +++ b/base/base_tests/logging_test.cpp @@ -1,4 +1,3 @@ -#include "base/SRC_FIRST.hpp" #include "testing/testing.hpp" #include "base/logging.hpp" diff --git a/base/base_tests/ref_counted_tests.cpp b/base/base_tests/ref_counted_tests.cpp index f1863eb499..f7f690fa80 100644 --- a/base/base_tests/ref_counted_tests.cpp +++ b/base/base_tests/ref_counted_tests.cpp @@ -58,7 +58,7 @@ UNIT_TEST(RefCounted_Smoke) TEST_EQUAL(2, a->NumRefs(), ()); TEST(!destroyed, ()); - RefCountPtr d(move(b)); + RefCountPtr d(std::move(b)); TEST(b.Get() == nullptr, ()); TEST(a.Get() == d.Get(), ()); TEST_EQUAL(2, a->NumRefs(), ()); diff --git a/base/base_tests/regexp_test.cpp b/base/base_tests/regexp_test.cpp index bd13b9d1f4..a1f7474505 100644 --- a/base/base_tests/regexp_test.cpp +++ b/base/base_tests/regexp_test.cpp @@ -28,7 +28,7 @@ UNIT_TEST(RegExp_ForEachMatched) { string const s = "6.66, 9.99"; - vector v; + std::vector v; strings::ForEachMatched(s, exp, MakeBackInsertFunctor(v)); TEST_EQUAL(v.size(), 1, ()); TEST_EQUAL(v[0], s, ()); @@ -37,7 +37,7 @@ UNIT_TEST(RegExp_ForEachMatched) { string const s1 = "6.66, 9.99"; string const s2 = "-5.55, -7.77"; - vector v; + std::vector v; strings::ForEachMatched(s1 + " 180 , bfuewib 365@" + s2, exp, MakeBackInsertFunctor(v)); TEST_EQUAL(v.size(), 2, ()); TEST_EQUAL(v[0], s1, ()); @@ -46,7 +46,7 @@ UNIT_TEST(RegExp_ForEachMatched) { string const s = "X6.66, 9.99"; - vector v; + std::vector v; strings::ForEachMatched(s, exp, MakeBackInsertFunctor(v)); TEST_EQUAL(v.size(), 1, ()); TEST_EQUAL(v[0], string(s.begin() + 1, s.end()), ()); @@ -54,7 +54,7 @@ UNIT_TEST(RegExp_ForEachMatched) { string const s = "6.66, 9.99X"; - vector v; + std::vector v; strings::ForEachMatched(s, exp, MakeBackInsertFunctor(v)); TEST_EQUAL(v.size(), 1, ()); TEST_EQUAL(v[0], string(s.begin(), s.end() - 1), ()); @@ -62,14 +62,14 @@ UNIT_TEST(RegExp_ForEachMatched) { string const s = "6.66X, 9.99"; - vector v; + std::vector v; strings::ForEachMatched(s, exp, MakeBackInsertFunctor(v)); TEST_EQUAL(v.size(), 0, ()); } { string const s = "6.66, X9.99"; - vector v; + std::vector v; strings::ForEachMatched(s, exp, MakeBackInsertFunctor(v)); TEST_EQUAL(v.size(), 0, ()); } diff --git a/base/base_tests/rolling_hash_test.cpp b/base/base_tests/rolling_hash_test.cpp index b96e41452a..21eb1caa1d 100644 --- a/base/base_tests/rolling_hash_test.cpp +++ b/base/base_tests/rolling_hash_test.cpp @@ -41,7 +41,7 @@ template void TestRollingHasher() { typedef typename RollingHasherT::hash_type hash_type; RollingHasherT hash; - vector hashes; + std::vector hashes; hashes.push_back(hash.Init(static_cast(s), size)); for (uint32_t i = size; i < len; ++i) hashes.push_back(hash.Scroll(s[i - size], s[i])); diff --git a/base/base_tests/scope_guard_test.cpp b/base/base_tests/scope_guard_test.cpp index b66a474948..a3b9b8840d 100644 --- a/base/base_tests/scope_guard_test.cpp +++ b/base/base_tests/scope_guard_test.cpp @@ -1,4 +1,3 @@ -#include "base/SRC_FIRST.hpp" #include "testing/testing.hpp" #include "base/scope_guard.hpp" diff --git a/base/base_tests/stl_add_test.cpp b/base/base_tests/stl_add_test.cpp index ae3e8e9181..d425003cea 100644 --- a/base/base_tests/stl_add_test.cpp +++ b/base/base_tests/stl_add_test.cpp @@ -36,7 +36,7 @@ namespace UNIT_TEST(STLAdd_RemoveIfKeepValid) { { - vector v; + std::vector v; TEST(RemoveIfKeepValid(v.begin(), v.end(), EqualZero()) == v.end(), ()); v.push_back(1); @@ -47,7 +47,7 @@ UNIT_TEST(STLAdd_RemoveIfKeepValid) } { - vector v; + std::vector v; v.push_back(0); TEST(RemoveIfKeepValid(v.begin(), v.end(), EqualZero()) == v.begin(), ()); @@ -90,11 +90,11 @@ namespace { template void CheckAccumulateIntervals(size_t & idTest, - pair (&arr1)[N1], - pair (&arr2)[N2], - pair (&arr3)[N3]) + std::pair (&arr1)[N1], + std::pair (&arr2)[N2], + std::pair (&arr3)[N3]) { - vector > res; + std::vector > res; AccumulateIntervals1With2(arr1, arr1 + N1, arr2, arr2 + N2, back_inserter(res)); ++idTest; @@ -105,12 +105,12 @@ namespace UNIT_TEST(STLAdd_AccumulateIntervals) { - typedef pair T; + typedef std::pair T; size_t idTest = 0; // bound cases { - vector res; + std::vector res; T arr[] = { T(10, 20) }; res.clear(); diff --git a/base/base_tests/string_utils_test.cpp b/base/base_tests/string_utils_test.cpp index 6d09bd530d..8f01391353 100644 --- a/base/base_tests/string_utils_test.cpp +++ b/base/base_tests/string_utils_test.cpp @@ -44,7 +44,7 @@ UNIT_TEST(LowerUniChar) if (!semicolon) continue; string const capital = *semicolon; - istringstream stream(capital); + std::istringstream stream(capital); strings::UniChar uc; stream >> hex >> uc; ++semicolon; @@ -296,7 +296,7 @@ UNIT_TEST(to_string) TEST_EQUAL(strings::to_string(123456789123456789ULL), "123456789123456789", ()); TEST_EQUAL(strings::to_string(-987654321987654321LL), "-987654321987654321", ()); - uint64_t const n = numeric_limits::max(); + uint64_t const n = std::numeric_limits::max(); TEST_EQUAL(strings::to_string(n), "18446744073709551615", ()); } @@ -454,9 +454,9 @@ UNIT_TEST(SimpleTokenizer) UNIT_TEST(Tokenize) { { - initializer_list expected{"acb", "def", "ghi"}; - TEST_EQUAL(strings::Tokenize("acb def ghi", " " /* delims */), vector(expected), ()); - TEST_EQUAL(strings::Tokenize("acb def ghi", " " /* delims */), set(expected), ()); + std::initializer_list expected{"acb", "def", "ghi"}; + TEST_EQUAL(strings::Tokenize("acb def ghi", " " /* delims */), std::vector(expected), ()); + TEST_EQUAL(strings::Tokenize("acb def ghi", " " /* delims */), std::set(expected), ()); } } diff --git a/base/base_tests/threaded_list_test.cpp b/base/base_tests/threaded_list_test.cpp index 5deeba40ef..806e155823 100644 --- a/base/base_tests/threaded_list_test.cpp +++ b/base/base_tests/threaded_list_test.cpp @@ -1,11 +1,9 @@ -#include "base/SRC_FIRST.hpp" #include "testing/testing.hpp" #include "base/threaded_list.hpp" -#include "base/threaded_priority_queue.hpp" #include "base/thread.hpp" - #include "base/logging.hpp" +#include "base/stl_add.hpp" #include "std/mutex.hpp" @@ -13,10 +11,10 @@ struct ThreadedListProcessor : public threads::IRoutine { ThreadedList & m_p; mutex & m_resMutex; - list & m_res; + std::list & m_res; int m_id; - ThreadedListProcessor(ThreadedList & p, mutex & resMutex, list & res, int id) + ThreadedListProcessor(ThreadedList & p, mutex & resMutex, std::list & res, int id) : m_p(p), m_resMutex(resMutex), m_res(res), m_id(id) { } @@ -37,52 +35,23 @@ struct ThreadedListProcessor : public threads::IRoutine } }; -struct ThreadedPriorityQueueProcessor : public threads::IRoutine -{ - ThreadedPriorityQueue & m_p; - mutex & m_resMutex; - list & m_res; - int m_id; - - ThreadedPriorityQueueProcessor(ThreadedPriorityQueue & p, mutex & resMutex, list & res, - int id) - : m_p(p), m_resMutex(resMutex), m_res(res), m_id(id) - { - } - - virtual void Do() - { - while (!m_p.IsCancelled()) - { - int res = m_p.Top(true /* doPop */); - { - lock_guard resGuard(m_resMutex); - m_res.push_back(res); - } - LOG(LINFO, (m_id, " thread got ", res)); - threads::Sleep(10); - } - LOG(LINFO, (m_id, " thread is cancelled")); - } -}; - UNIT_TEST(ThreadedList) { - list l; + std::list l; mutex resMutex; - list res; + std::list res; ThreadedList p; threads::Thread t0; - t0.Create(make_unique(p, resMutex, res, 0)); + t0.Create(my::make_unique(p, resMutex, res, 0)); threads::Thread t1; - t1.Create(make_unique(p, resMutex, res, 1)); + t1.Create(my::make_unique(p, resMutex, res, 1)); threads::Thread t2; - t2.Create(make_unique(p, resMutex, res, 2)); + t2.Create(my::make_unique(p, resMutex, res, 2)); p.PushBack(0); threads::Sleep(200); @@ -106,43 +75,3 @@ UNIT_TEST(ThreadedList) TEST_EQUAL(res.front(), 2, ()); res.pop_front(); } - -UNIT_TEST(ThreadedPriorityQueue) -{ - mutex resMutex; - list res; - - ThreadedPriorityQueue p; - - threads::Thread t0; - t0.Create(make_unique(p, resMutex, res, 0)); - - threads::Thread t1; - t1.Create(make_unique(p, resMutex, res, 1)); - - threads::Thread t2; - t2.Create(make_unique(p, resMutex, res, 2)); - - p.Push(0); - threads::Sleep(200); - - p.Push(1); - threads::Sleep(200); - - p.Push(2); - threads::Sleep(200); - - p.Cancel(); - - t0.Join(); - t1.Join(); - t2.Join(); - - TEST_EQUAL(res.front(), 0, ()); - res.pop_front(); - TEST_EQUAL(res.front(), 1, ()); - res.pop_front(); - TEST_EQUAL(res.front(), 2, ()); - res.pop_front(); -} - diff --git a/base/base_tests/threads_test.cpp b/base/base_tests/threads_test.cpp index 5f2af4bf29..e482cd55bb 100644 --- a/base/base_tests/threads_test.cpp +++ b/base/base_tests/threads_test.cpp @@ -1,8 +1,9 @@ #include "testing/testing.hpp" #include "base/thread.hpp" +#include "base/stl_add.hpp" -#include "std/vector.hpp" +#include typedef std::vector Vector; @@ -44,13 +45,13 @@ UNIT_TEST(Simple_Threads) Vector vec; threads::Thread reader; - bool ok = reader.Create(make_unique(vec)); + bool ok = reader.Create(my::make_unique(vec)); TEST( ok, ("Create Generator thread") ); reader.Join(); threads::Thread writer; - ok = writer.Create(make_unique(vec)); + ok = writer.Create(my::make_unique(vec)); TEST( ok, ("Create Reader thread") ); writer.Join(); diff --git a/base/base_tests/worker_thread_test.cpp b/base/base_tests/worker_thread_test.cpp deleted file mode 100644 index a5f3ac456c..0000000000 --- a/base/base_tests/worker_thread_test.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "testing/testing.hpp" - -#include "base/worker_thread.hpp" - -#include "std/shared_ptr.hpp" -#include "std/vector.hpp" - -struct Task -{ - Task(vector & buffer, size_t index) : m_buffer(buffer), m_index(index) {} - - void operator()() const { m_buffer.push_back(m_index); } - - vector & m_buffer; - size_t m_index; -}; - -UNIT_TEST(WorkerThread_Basic) -{ - size_t const kNumTasks = 10; - size_t const kMaxTasksInQueue = 5; - - my::WorkerThread thread(kMaxTasksInQueue); - - vector buffer; - for (size_t i = 0; i < kNumTasks; ++i) - thread.Push(make_shared(buffer, i)); - thread.RunUntilIdleAndStop(); - - TEST_EQUAL(kNumTasks, buffer.size(), ()); - for (size_t i = 0; i < buffer.size(); ++i) - TEST_EQUAL(i, buffer[i], ()); -} - -UNIT_TEST(WorkerThread_NoStopCall) -{ - size_t const kNumTasks = 10; - size_t const kMaxTasksInQueue = 5; - vector buffer; - - { - my::WorkerThread thread(kMaxTasksInQueue); - for (size_t i = 0; i < kNumTasks; ++i) - thread.Push(make_shared(buffer, i)); - } - - TEST_EQUAL(kNumTasks, buffer.size(), ()); - for (size_t i = 0; i < buffer.size(); ++i) - TEST_EQUAL(i, buffer[i], ()); -} diff --git a/base/bits.hpp b/base/bits.hpp index 94c5d501db..f767c85d55 100644 --- a/base/bits.hpp +++ b/base/bits.hpp @@ -1,9 +1,9 @@ #pragma once #include "base/assert.hpp" -#include "std/cstdint.hpp" -#include "std/limits.hpp" -#include "std/type_traits.hpp" +#include +#include +#include namespace bits { @@ -112,16 +112,16 @@ namespace bits return (x << 1) | (x >> (sizeof(T) * 8 - 1)); } - template inline typename make_unsigned::type ZigZagEncode(T x) + template inline typename std::make_unsigned::type ZigZagEncode(T x) { - static_assert(is_signed::value, "Type should be signed"); + static_assert(std::is_signed::value, "Type should be signed"); return (x << 1) ^ (x >> (sizeof(x) * 8 - 1)); } - template inline typename make_signed::type ZigZagDecode(T x) + template inline typename std::make_signed::type ZigZagDecode(T x) { - static_assert(is_unsigned::value, "Type should be unsigned."); - return (x >> 1) ^ -static_cast::type>(x & 1); + static_assert(std::is_unsigned::value, "Type should be unsigned."); + return (x >> 1) ^ -static_cast::type>(x & 1); } inline uint32_t PerfectShuffle(uint32_t x) @@ -205,7 +205,7 @@ namespace bits inline uint64_t GetFullMask(uint8_t numBits) { ASSERT_LESS_OR_EQUAL(numBits, 64, ()); - return numBits == 64 ? numeric_limits::max() + return numBits == 64 ? std::numeric_limits::max() : (static_cast(1) << numBits) - 1; } } // namespace bits diff --git a/base/buffer_vector.hpp b/base/buffer_vector.hpp index 646d41ef3e..f807cf18c7 100644 --- a/base/buffer_vector.hpp +++ b/base/buffer_vector.hpp @@ -1,13 +1,12 @@ #pragma once #include "base/assert.hpp" #include "base/stl_iterator.hpp" -#include "base/swap.hpp" -#include "std/algorithm.hpp" -#include "std/cstring.hpp" // for memcpy -#include "std/type_traits.hpp" -#include "std/utility.hpp" -#include "std/vector.hpp" +#include +#include // for memcpy +#include +#include +#include template class buffer_vector @@ -16,34 +15,34 @@ private: enum { USE_DYNAMIC = N + 1 }; T m_static[N]; size_t m_size; - vector m_dynamic; + std::vector m_dynamic; inline bool IsDynamic() const { return m_size == USE_DYNAMIC; } /// @todo clang on linux doesn't have is_trivially_copyable. #ifndef OMIM_OS_LINUX template - typename enable_if::value, void>::type + typename std::enable_if::value, void>::type MoveStatic(buffer_vector & rhs) { memcpy(m_static, rhs.m_static, rhs.m_size*sizeof(T)); } template - typename enable_if::value, void>::type + typename std::enable_if::value, void>::type MoveStatic(buffer_vector & rhs) { for (size_t i = 0; i < rhs.m_size; ++i) - Swap(m_static[i], rhs.m_static[i]); + std::swap(m_static[i], rhs.m_static[i]); } #else template - typename enable_if::value, void>::type + typename std::enable_if::value, void>::type MoveStatic(buffer_vector & rhs) { memcpy(m_static, rhs.m_static, rhs.m_size*sizeof(T)); } template - typename enable_if::value, void>::type + typename std::enable_if::value, void>::type MoveStatic(buffer_vector & rhs) { for (size_t i = 0; i < rhs.m_size; ++i) @@ -65,7 +64,7 @@ public: resize(n, c); } - explicit buffer_vector(initializer_list const & initList) : m_size(0) + explicit buffer_vector(std::initializer_list const & initList) : m_size(0) { assign(initList.begin(), initList.end()); } @@ -280,9 +279,9 @@ public: void swap(buffer_vector & rhs) { m_dynamic.swap(rhs.m_dynamic); - Swap(m_size, rhs.m_size); + std::swap(m_size, rhs.m_size); for (size_t i = 0; i < N; ++i) - Swap(m_static[i], rhs.m_static[i]); + std::swap(m_static[i], rhs.m_static[i]); } void push_back(T const & t) @@ -310,19 +309,19 @@ public: { if (IsDynamic()) { - m_dynamic.push_back(move(t)); + m_dynamic.push_back(std::move(t)); return; } if (m_size < N) { - Swap(m_static[m_size++], t); + std::swap(m_static[m_size++], t); } else { ASSERT_EQUAL(m_size, N, ()); SwitchToDynamic(); - m_dynamic.push_back(move(t)); + m_dynamic.push_back(std::move(t)); ASSERT_EQUAL(m_dynamic.size(), N + 1, ()); } } @@ -344,20 +343,20 @@ public: { if (IsDynamic()) { - m_dynamic.emplace_back(forward(args)...); + m_dynamic.emplace_back(std::forward(args)...); return; } if (m_size < N) { - value_type v(forward(args)...); - Swap(v, m_static[m_size++]); + value_type v(std::forward(args)...); + std::swap(v, m_static[m_size++]); } else { ASSERT_EQUAL(m_size, N, ()); SwitchToDynamic(); - m_dynamic.emplace_back(forward(args)...); + m_dynamic.emplace_back(std::forward(args)...); ASSERT_EQUAL(m_dynamic.size(), N + 1, ()); } } @@ -379,7 +378,7 @@ public: { if (pos != m_size) for (ptrdiff_t i = m_size - 1; i >= pos; --i) - Swap(m_static[i], m_static[i + n]); + std::swap(m_static[i], m_static[i + n]); m_size += n; T * writableWhere = &m_static[0] + pos; @@ -405,9 +404,9 @@ public: { iterator b = begin(); iterator e = end(); - iterator i = remove_if(b, e, fn); + iterator i = std::remove_if(b, e, fn); if (i != e) - resize(distance(b, i)); + resize(std::distance(b, i)); } private: @@ -419,7 +418,7 @@ private: for (size_t i = 0; i < m_size; ++i) { m_dynamic.emplace_back(); - Swap(m_static[i], m_dynamic.back()); + std::swap(m_static[i], m_dynamic.back()); } m_size = USE_DYNAMIC; } @@ -432,7 +431,7 @@ void swap(buffer_vector & r1, buffer_vector & r2) } template -inline string DebugPrint(buffer_vector const & v) +inline std::string DebugPrint(buffer_vector const & v) { return ::my::impl::DebugPrintSequence(v.data(), v.data() + v.size()); } @@ -452,5 +451,5 @@ inline bool operator!=(buffer_vector const & v1, buffer_vector con template inline bool operator<(buffer_vector const & v1, buffer_vector const & v2) { - return lexicographical_compare(v1.begin(), v1.end(), v2.begin(), v2.end()); + return std::lexicographical_compare(v1.begin(), v1.end(), v2.begin(), v2.end()); } diff --git a/base/cache.hpp b/base/cache.hpp index eb695c9af7..9efa576f56 100644 --- a/base/cache.hpp +++ b/base/cache.hpp @@ -4,9 +4,9 @@ #include "base/base.hpp" #include "base/macros.hpp" -#include "std/type_traits.hpp" -#include "std/unique_ptr.hpp" -#include "std/utility.hpp" +#include +#include +#include namespace my @@ -29,7 +29,7 @@ namespace my void Init(uint32_t logCacheSize) { ASSERT(logCacheSize > 0 && logCacheSize < 32, (logCacheSize)); - static_assert((is_same::value || is_same::value), ""); + static_assert((std::is_same::value || std::is_same::value), ""); m_cache.reset(new Data[1 << logCacheSize]); m_hashMask = (1 << logCacheSize) - 1; @@ -106,7 +106,7 @@ namespace my ValueT m_Value; }; - unique_ptr m_cache; + std::unique_ptr m_cache; uint32_t m_hashMask; }; diff --git a/base/cancellable.hpp b/base/cancellable.hpp index 819272f3cb..4eb5787769 100644 --- a/base/cancellable.hpp +++ b/base/cancellable.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/atomic.hpp" +#include namespace my { @@ -23,6 +23,6 @@ public: virtual bool IsCancelled() const { return m_cancelled; } private: - atomic m_cancelled; + std::atomic m_cancelled; }; } // namespace my diff --git a/base/condition.cpp b/base/condition.cpp index be9ecc000c..fd66f3b872 100644 --- a/base/condition.cpp +++ b/base/condition.cpp @@ -1,12 +1,90 @@ -#include "condition.hpp" +#include "base/condition.hpp" #include "std/target_os.hpp" -#if defined(OMIM_OS_WINDOWS_NATIVE) - #include "condition_windows_native.cpp" -#else - #include "condition_posix.cpp" -#endif +#include "base/mutex.hpp" +#include "std/systime.hpp" + +#include + +#include +#include + + +namespace threads +{ + namespace impl + { + class ConditionImpl + { + public: + Mutex m_Mutex; + pthread_cond_t m_Condition; + }; + } + + Condition::Condition() : m_pImpl(new impl::ConditionImpl()) + { + ::pthread_cond_init(&m_pImpl->m_Condition, 0); + } + + Condition::~Condition() + { + ::pthread_cond_destroy(&m_pImpl->m_Condition); + delete m_pImpl; + } + + void Condition::Signal(bool broadcast) + { + if (broadcast) + ::pthread_cond_broadcast(&m_pImpl->m_Condition); + else + ::pthread_cond_signal(&m_pImpl->m_Condition); + } + + void Condition::Wait() + { + ::pthread_cond_wait(&m_pImpl->m_Condition, &m_pImpl->m_Mutex.m_Mutex); + } + + bool Condition::Wait(unsigned ms) + { + if (ms == -1) + { + Wait(); + return false; + } + + ::timeval curtv; + ::gettimeofday(&curtv, 0); + + ::timespec ts; + + uint64_t deltaNanoSec = curtv.tv_usec * 1000 + ms * 1000000; + + ts.tv_sec = curtv.tv_sec + deltaNanoSec / 1000000000; + ts.tv_nsec = deltaNanoSec % 1000000000; + + int res = ::pthread_cond_timedwait(&m_pImpl->m_Condition, &m_pImpl->m_Mutex.m_Mutex, &ts); + + return (res == ETIMEDOUT); + } + + void Condition::Lock() + { + m_pImpl->m_Mutex.Lock(); + } + + bool Condition::TryLock() + { + return m_pImpl->m_Mutex.TryLock(); + } + + void Condition::Unlock() + { + m_pImpl->m_Mutex.Unlock(); + } +} namespace threads { diff --git a/base/condition_bada.cpp b/base/condition_bada.cpp deleted file mode 100644 index 22ed384169..0000000000 --- a/base/condition_bada.cpp +++ /dev/null @@ -1,54 +0,0 @@ -#include "std/target_os.hpp" - -#ifdef OMIM_OS_BADA - -#include "base/condition.hpp" - -#include - -namespace threads -{ - namespace impl - { - class ConditionImpl - { - public: - Osp::Base::Runtime::Monitor m_Monitor; - }; - } - - Condition::Condition() : m_pImpl(new impl::ConditionImpl()) - { - m_pImpl->m_Monitor.Construct(); - } - - Condition::~Condition() - { - delete m_pImpl; - } - - void Condition::Signal(bool broadcast) - { - if (broadcast) - m_pImpl->m_Monitor.NotifyAll(); - else - m_pImpl->m_Monitor.Notify(); - } - - void Condition::Wait() - { - m_pImpl->m_Monitor.Wait(); - } - - void Condition::Lock() - { - m_pImpl->m_Monitor.Enter(); - } - - void Condition::Unlock() - { - m_pImpl->m_Monitor.Exit(); - } -} - -#endif // OMIM_OS_BADA diff --git a/base/condition_posix.cpp b/base/condition_posix.cpp deleted file mode 100644 index 24c743bbd4..0000000000 --- a/base/condition_posix.cpp +++ /dev/null @@ -1,89 +0,0 @@ -#include "std/target_os.hpp" - -#if !defined(OMIM_OS_WINDOWS_NATIVE) - -#include "base/condition.hpp" -#include "base/mutex.hpp" - -#include "std/cstdint.hpp" -#include "std/errno.hpp" -#include "std/systime.hpp" - -#include - -namespace threads -{ - namespace impl - { - class ConditionImpl - { - public: - Mutex m_Mutex; - pthread_cond_t m_Condition; - }; - } - - Condition::Condition() : m_pImpl(new impl::ConditionImpl()) - { - ::pthread_cond_init(&m_pImpl->m_Condition, 0); - } - - Condition::~Condition() - { - ::pthread_cond_destroy(&m_pImpl->m_Condition); - delete m_pImpl; - } - - void Condition::Signal(bool broadcast) - { - if (broadcast) - ::pthread_cond_broadcast(&m_pImpl->m_Condition); - else - ::pthread_cond_signal(&m_pImpl->m_Condition); - } - - void Condition::Wait() - { - ::pthread_cond_wait(&m_pImpl->m_Condition, &m_pImpl->m_Mutex.m_Mutex); - } - - bool Condition::Wait(unsigned ms) - { - if (ms == -1) - { - Wait(); - return false; - } - - ::timeval curtv; - ::gettimeofday(&curtv, 0); - - ::timespec ts; - - uint64_t deltaNanoSec = curtv.tv_usec * 1000 + ms * 1000000; - - ts.tv_sec = curtv.tv_sec + deltaNanoSec / 1000000000; - ts.tv_nsec = deltaNanoSec % 1000000000; - - int res = ::pthread_cond_timedwait(&m_pImpl->m_Condition, &m_pImpl->m_Mutex.m_Mutex, &ts); - - return (res == ETIMEDOUT); - } - - void Condition::Lock() - { - m_pImpl->m_Mutex.Lock(); - } - - bool Condition::TryLock() - { - return m_pImpl->m_Mutex.TryLock(); - } - - void Condition::Unlock() - { - m_pImpl->m_Mutex.Unlock(); - } -} - -#endif diff --git a/base/condition_windows_native.cpp b/base/condition_windows_native.cpp deleted file mode 100644 index 3f6a69d7c3..0000000000 --- a/base/condition_windows_native.cpp +++ /dev/null @@ -1,291 +0,0 @@ -#include "std/target_os.hpp" - -#ifdef OMIM_OS_WINDOWS_NATIVE - -#include "base/condition.hpp" -#include "base/mutex.hpp" - -#include "std/windows.hpp" - -typedef void (WINAPI *InitFn)(PCONDITION_VARIABLE); -typedef void (WINAPI *WakeFn)(PCONDITION_VARIABLE); -typedef void (WINAPI *WakeAllFn)(PCONDITION_VARIABLE); -typedef BOOL (WINAPI *SleepFn)(PCONDITION_VARIABLE, PCRITICAL_SECTION, DWORD); - -namespace threads -{ - namespace impl - { - class ConditionImpl - { - public: - virtual ~ConditionImpl() {} - virtual void Signal(bool broadcast) = 0; - virtual void Wait() = 0; - virtual bool Wait(unsigned ms) = 0; - virtual void Lock() = 0; - virtual bool TryLock() = 0; - virtual void Unlock() = 0; - }; - - class ImplWinVista : public ConditionImpl - { - InitFn m_pInit; - WakeFn m_pWake; - WakeAllFn m_pWakeAll; - SleepFn m_pSleep; - - CONDITION_VARIABLE m_Condition; - Mutex m_mutex; - - public: - ImplWinVista(InitFn pInit, WakeFn pWake, WakeAllFn pWakeAll, SleepFn pSleep) - : m_pInit(pInit), m_pWake(pWake), m_pWakeAll(pWakeAll), m_pSleep(pSleep) - { - m_pInit(&m_Condition); - } - - void Signal(bool broadcast) - { - if (broadcast) - m_pWakeAll(&m_Condition); - else - m_pWake(&m_Condition); - } - - void Wait() - { - m_pSleep(&m_Condition, &m_mutex.m_Mutex, INFINITE); - } - - bool Wait(unsigned ms) - { - if (!m_pSleep(&m_Condition, &m_mutex.m_Mutex, ms)) - return GetLastError() == ERROR_TIMEOUT; - return false; - } - - void Lock() - { - m_mutex.Lock(); - } - - bool TryLock() - { - return m_mutex.TryLock(); - } - - void Unlock() - { - m_mutex.Unlock(); - } - }; - - /////////////////////////////////////////////////////////////// - /// Based on Richter's SignalObjectAndWait solution - class ImplWinXP : public ConditionImpl - { - /// Number of waiting threads - int waiters_count_; - /// Serialize access to - CRITICAL_SECTION waiters_count_lock_; - /// Semaphore used to queue up threads waiting for the condition to - /// become signaled - HANDLE sema_; - /// An auto-reset event used by the broadcast/signal thread to wait - /// for all the waiting thread(s) to wake up and be released from the - /// semaphore - HANDLE waiters_done_; - /// Keeps track of whether we were broadcasting or signaling. This - /// allows us to optimize the code if we're just signaling - size_t was_broadcast_; - - HANDLE m_mutex; - - public: - ImplWinXP() : waiters_count_(0), was_broadcast_(0) - { - ::InitializeCriticalSection(&waiters_count_lock_); - m_mutex = ::CreateMutexA(NULL, FALSE, NULL); - - sema_ = ::CreateSemaphore(NULL, // no security - 0, // initially 0 - 0x7fffffff, // max count - NULL); // unnamed - waiters_done_ = CreateEvent(NULL, // no security - FALSE, // auto-reset - FALSE, // non-signaled initially - NULL); // unnamed - } - - ~ImplWinXP() - { - ::CloseHandle(m_mutex); - ::DeleteCriticalSection(&waiters_count_lock_); - } - - void Signal(bool broadcast) - { - if (broadcast) - { - // This is needed to ensure that and are - // consistent relative to each other - EnterCriticalSection(&waiters_count_lock_); - int have_waiters = 0; - - if (waiters_count_ > 0) - { - // We are broadcasting, even if there is just one waiter... - // Record that we are broadcasting, which helps optimize - // for the non-broadcast case. - was_broadcast_ = 1; - have_waiters = 1; - } - - if (have_waiters) - { - // Wake up all the waiters atomically. - ReleaseSemaphore(sema_, waiters_count_, 0); - - LeaveCriticalSection(&waiters_count_lock_); - - // Wait for all the awakened threads to acquire the counting - // semaphore. - WaitForSingleObject(waiters_done_, INFINITE); - // This assignment is okay, wven without the held - // because no other waiter threads can wake up to access it. - was_broadcast_ = 0; - } - else - LeaveCriticalSection(&waiters_count_lock_); - } - else - { - EnterCriticalSection(&waiters_count_lock_); - bool const have_waiters = waiters_count_ > 0; - LeaveCriticalSection(&waiters_count_lock_); - - // If there aren't any waiters, then this is a no-op. - if (have_waiters) - ::ReleaseSemaphore(sema_, 1, 0); - } - } - - void Wait() - { - Wait(-1); - } - - bool Wait(unsigned ms) - { - // Avoid race conditions - ::EnterCriticalSection(&waiters_count_lock_); - ++waiters_count_; - ::LeaveCriticalSection(&waiters_count_lock_); - - // This call atomically releases the mutex and waits on the - // semaphore until or - // are called by another thread - - DWORD toWait = (ms == -1) ? INFINITE : ms; - - bool res = false; - - if (::SignalObjectAndWait(m_mutex, sema_, toWait, FALSE) == WAIT_TIMEOUT) - res = true; - - // Reacquire lock to avoid race conditions - ::EnterCriticalSection(&waiters_count_lock_); - - // We're no longer waiting... - --waiters_count_; - - // Check to see if we're the last waiter after . - bool const last_waiter = was_broadcast_ && waiters_count_ == 0; - - ::LeaveCriticalSection(&waiters_count_lock_); - - // If we're the last waiter thread during this particular broadcast - // then let all the other threads proceed - if (last_waiter) - // This call atomically signals the event and waits until - // it can acquire the . This is required to ensure fairness. - ::SignalObjectAndWait(waiters_done_, m_mutex, INFINITE, FALSE); - else - // Always regain the external mutex since that's the guarantee we - // give to our callers. - ::WaitForSingleObject(m_mutex, INFINITE); - - return res; - } - - void Lock() - { - ::WaitForSingleObject(m_mutex, INFINITE); - } - - bool TryLock() - { - /// @todo I don't care :) - Lock(); - return true; - } - - void Unlock() - { - ::ReleaseMutex(m_mutex); - } - }; - } - /////////////////////////////////////////////////////////////// - Condition::Condition() - { - HMODULE handle = GetModuleHandle(TEXT("kernel32.dll")); - InitFn pInit = (InitFn)GetProcAddress(handle, "InitializeConditionVariable"); - WakeFn pWake = (WakeFn)GetProcAddress(handle, "WakeConditionVariable"); - WakeAllFn pWakeAll = (WakeFn)GetProcAddress(handle, "WakeAllConditionVariable"); - SleepFn pSleep = (SleepFn)GetProcAddress(handle, "SleepConditionVariableCS"); - - if (pInit && pWake && pWakeAll && pSleep) - m_pImpl = new impl::ImplWinVista(pInit, pWake, pWakeAll, pSleep); - else - m_pImpl = new impl::ImplWinXP(); - } - - Condition::~Condition() - { - delete m_pImpl; - } - - void Condition::Signal(bool broadcast) - { - m_pImpl->Signal(broadcast); - } - - void Condition::Wait() - { - return m_pImpl->Wait(); - } - - bool Condition::Wait(unsigned ms) - { - return m_pImpl->Wait(ms); - } - - void Condition::Lock() - { - m_pImpl->Lock(); - } - - bool Condition::TryLock() - { - return m_pImpl->TryLock(); - } - - void Condition::Unlock() - { - m_pImpl->Unlock(); - } -} - -#endif // OMIM_OS_WINDOWS_NATIVE diff --git a/base/const_helper.hpp b/base/const_helper.hpp deleted file mode 100644 index b5a71a9336..0000000000 --- a/base/const_helper.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -namespace my -{ - template struct PropagateConst - { - typedef TTo type; - }; - template struct PropagateConst - { - typedef TTo const type; - }; -} diff --git a/base/deferred_task.cpp b/base/deferred_task.cpp index b6d76e0029..c3cc50e6ff 100644 --- a/base/deferred_task.cpp +++ b/base/deferred_task.cpp @@ -6,7 +6,7 @@ DeferredTask::DeferredTask(TDuration const & duration) : m_duration(duration) { m_thread = threads::SimpleThread([this] { - unique_lock l(m_mutex); + std::unique_lock l(m_mutex); while (!m_terminate) { if (!m_fn) @@ -15,7 +15,7 @@ DeferredTask::DeferredTask(TDuration const & duration) : m_duration(duration) continue; } - if (m_cv.wait_for(l, m_duration) != cv_status::timeout || !m_fn) + if (m_cv.wait_for(l, m_duration) != std::cv_status::timeout || !m_fn) continue; auto fn = move(m_fn); @@ -31,7 +31,7 @@ DeferredTask::DeferredTask(TDuration const & duration) : m_duration(duration) DeferredTask::~DeferredTask() { { - unique_lock l(m_mutex); + std::unique_lock l(m_mutex); m_terminate = true; } m_cv.notify_one(); @@ -41,7 +41,7 @@ DeferredTask::~DeferredTask() void DeferredTask::Drop() { { - unique_lock l(m_mutex); + std::unique_lock l(m_mutex); m_fn = nullptr; } m_cv.notify_one(); diff --git a/base/deferred_task.hpp b/base/deferred_task.hpp index de9b9e40cc..246b99d554 100644 --- a/base/deferred_task.hpp +++ b/base/deferred_task.hpp @@ -2,20 +2,20 @@ #include "base/thread.hpp" -#include "std/chrono.hpp" -#include "std/condition_variable.hpp" -#include "std/function.hpp" -#include "std/mutex.hpp" +#include +#include +#include +#include namespace my { class DeferredTask { - using TDuration = duration; + using TDuration = std::chrono::duration; threads::SimpleThread m_thread; - mutex m_mutex; - condition_variable m_cv; - function m_fn; + std::mutex m_mutex; + std::condition_variable m_cv; + std::function m_fn; TDuration m_duration; bool m_terminate = false; @@ -29,7 +29,7 @@ public: void RestartWith(TFn const && fn) { { - unique_lock l(m_mutex); + std::unique_lock l(m_mutex); m_fn = fn; } m_cv.notify_one(); diff --git a/base/dfa_helpers.hpp b/base/dfa_helpers.hpp index 5815f380f9..3c04cbcd27 100644 --- a/base/dfa_helpers.hpp +++ b/base/dfa_helpers.hpp @@ -2,7 +2,7 @@ #include "base/string_utils.hpp" -#include "std/string.hpp" +#include namespace strings { @@ -59,7 +59,7 @@ void DFAMove(DFAIt & it, UniString const & s) } template -void DFAMove(DFAIt & it, string const & s) +void DFAMove(DFAIt & it, std::string const & s) { DFAMove(it, MakeUniString(s)); } diff --git a/base/exception.cpp b/base/exception.cpp index 78853d0150..4f8584a2c1 100644 --- a/base/exception.cpp +++ b/base/exception.cpp @@ -4,7 +4,7 @@ char const * RootException::what() const throw() { size_t const count = m_Msg.size(); - string asciiMsg; + std::string asciiMsg; asciiMsg.resize(count); for (size_t i = 0; i < count; ++i) @@ -15,7 +15,7 @@ char const * RootException::what() const throw() asciiMsg[i] = '?'; } - static string msg; - msg = string(m_What) + ", \"" + asciiMsg + "\""; + static std::string msg; + msg = std::string(m_What) + ", \"" + asciiMsg + "\""; return msg.c_str(); } diff --git a/base/exception.hpp b/base/exception.hpp index 195ff101ee..87be96775e 100644 --- a/base/exception.hpp +++ b/base/exception.hpp @@ -2,13 +2,13 @@ #include "base/internal/message.hpp" #include "base/macros.hpp" -#include "std/exception.hpp" -#include "std/string.hpp" +#include +#include -class RootException : public exception +class RootException : public std::exception { public: - RootException(char const * what, string const & msg) : m_What(what), m_Msg(msg) + RootException(char const * what, std::string const & msg) : m_What(what), m_Msg(msg) { } @@ -18,14 +18,14 @@ public: virtual char const * what() const throw(); - string const & Msg() const throw() + std::string const & Msg() const throw() { return m_Msg; } private: char const * m_What; - string m_Msg; + std::string m_Msg; }; #define DECLARE_EXCEPTION(exception_name, base_exception) \ diff --git a/base/gmtime.hpp b/base/gmtime.hpp index c67e9f7ab8..a9552836b8 100644 --- a/base/gmtime.hpp +++ b/base/gmtime.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/ctime.hpp" +#include namespace my { diff --git a/base/internal/message.cpp b/base/internal/message.cpp index 5c9804c8e2..8a17c6bb13 100644 --- a/base/internal/message.cpp +++ b/base/internal/message.cpp @@ -3,7 +3,7 @@ #include "std/target_os.hpp" -string DebugPrint(string const & t) +std::string DebugPrint(std::string const & t) { #ifdef OMIM_OS_WINDOWS string res; diff --git a/base/internal/message.hpp b/base/internal/message.hpp index f9775a9a15..03d6d0f957 100644 --- a/base/internal/message.hpp +++ b/base/internal/message.hpp @@ -1,71 +1,71 @@ #pragma once -#include "std/array.hpp" -#include "std/deque.hpp" -#include "std/functional.hpp" -#include "std/initializer_list.hpp" -#include "std/iterator.hpp" -#include "std/list.hpp" -#include "std/map.hpp" -#include "std/set.hpp" -#include "std/sstream.hpp" -#include "std/string.hpp" -#include "std/unique_ptr.hpp" -#include "std/unordered_map.hpp" -#include "std/unordered_set.hpp" -#include "std/utility.hpp" -#include "std/vector.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /// @name Declarations. //@{ -template inline string DebugPrint(T const & t); +template inline std::string DebugPrint(T const & t); -string DebugPrint(string const & t); -inline string DebugPrint(char const * t); -inline string DebugPrint(char t); +std::string DebugPrint(std::string const & t); +inline std::string DebugPrint(char const * t); +inline std::string DebugPrint(char t); -template inline string DebugPrint(pair const & p); -template inline string DebugPrint(list const & v); -template inline string DebugPrint(vector const & v); -template > inline string DebugPrint(set const & v); -template > inline string DebugPrint(multiset const & v); -template > inline string DebugPrint(map const & v); -template inline string DebugPrint(initializer_list const & v); -template inline string DebugPrint(unique_ptr const & v); +template inline std::string DebugPrint(std::pair const & p); +template inline std::string DebugPrint(std::list const & v); +template inline std::string DebugPrint(std::vector const & v); +template > inline std::string DebugPrint(std::set const & v); +template > inline std::string DebugPrint(std::multiset const & v); +template > inline std::string DebugPrint(std::map const & v); +template inline std::string DebugPrint(std::initializer_list const & v); +template inline std::string DebugPrint(std::unique_ptr const & v); -template , class Pred = equal_to> -inline string DebugPrint(unordered_set const & v); -template , class Pred = equal_to> -inline string DebugPrint(unordered_map const & v); +template , class Pred = std::equal_to> +inline std::string DebugPrint(std::unordered_set const & v); +template , class Pred = std::equal_to> +inline std::string DebugPrint(std::unordered_map const & v); //@} -inline string DebugPrint(char const * t) +inline std::string DebugPrint(char const * t) { if (t) - return DebugPrint(string(t)); + return DebugPrint(std::string(t)); else - return string("NULL string pointer"); + return std::string("NULL string pointer"); } -inline string DebugPrint(char t) +inline std::string DebugPrint(char t) { - return DebugPrint(string(1, t)); + return DebugPrint(std::string(1, t)); } -inline string DebugPrint(signed char t) +inline std::string DebugPrint(signed char t) { return DebugPrint(static_cast(t)); } -inline string DebugPrint(unsigned char t) +inline std::string DebugPrint(unsigned char t) { return DebugPrint(static_cast(t)); } -template inline string DebugPrint(pair const & p) +template inline std::string DebugPrint(std::pair const & p) { - ostringstream out; + std::ostringstream out; out << "(" << DebugPrint(p.first) << ", " << DebugPrint(p.second) << ")"; return out.str(); } @@ -74,10 +74,10 @@ namespace my { namespace impl { - template inline string DebugPrintSequence(IterT beg, IterT end) + template inline std::string DebugPrintSequence(IterT beg, IterT end) { - ostringstream out; - out << "[" << distance(beg, end) << ":"; + std::ostringstream out; + out << "[" << std::distance(beg, end) << ":"; for (; beg != end; ++beg) out << " " << DebugPrint(*beg); out << " ]"; @@ -86,73 +86,73 @@ namespace my } } -template inline string DebugPrint(T (&arr) [N]) +template inline std::string DebugPrint(T (&arr) [N]) { return ::my::impl::DebugPrintSequence(arr, arr + N); } -template inline string DebugPrint(array const & v) +template inline std::string DebugPrint(std::array const & v) { return ::my::impl::DebugPrintSequence(v.begin(), v.end()); } -template inline string DebugPrint(vector const & v) +template inline std::string DebugPrint(std::vector const & v) { return ::my::impl::DebugPrintSequence(v.begin(), v.end()); } -template inline string DebugPrint(deque const & d) +template inline std::string DebugPrint(std::deque const & d) { return ::my::impl::DebugPrintSequence(d.begin(), d.end()); } -template inline string DebugPrint(list const & v) +template inline std::string DebugPrint(std::list const & v) { return ::my::impl::DebugPrintSequence(v.begin(), v.end()); } -template inline string DebugPrint(set const & v) +template inline std::string DebugPrint(std::set const & v) { return ::my::impl::DebugPrintSequence(v.begin(), v.end()); } -template inline string DebugPrint(multiset const & v) +template inline std::string DebugPrint(std::multiset const & v) { return ::my::impl::DebugPrintSequence(v.begin(), v.end()); } -template inline string DebugPrint(map const & v) +template inline std::string DebugPrint(std::map const & v) { return ::my::impl::DebugPrintSequence(v.begin(), v.end()); } -template inline string DebugPrint(initializer_list const & v) +template inline std::string DebugPrint(std::initializer_list const & v) { return ::my::impl::DebugPrintSequence(v.begin(), v.end()); } template -inline string DebugPrint(unordered_set const & v) +inline std::string DebugPrint(std::unordered_set const & v) { return ::my::impl::DebugPrintSequence(v.begin(), v.end()); } template -inline string DebugPrint(unordered_map const & v) +inline std::string DebugPrint(std::unordered_map const & v) { return ::my::impl::DebugPrintSequence(v.begin(), v.end()); } -template inline string DebugPrint(T const & t) +template inline std::string DebugPrint(T const & t) { - ostringstream out; + std::ostringstream out; out << t; return out.str(); } -template inline string DebugPrint(unique_ptr const & v) +template inline std::string DebugPrint(std::unique_ptr const & v) { - ostringstream out; + std::ostringstream out; if (v.get() != nullptr) out << DebugPrint(*v); else @@ -164,15 +164,15 @@ namespace my { namespace impl { - inline string Message() + inline std::string Message() { - return string(); + return std::string(); } - template string Message(T const & t) + template std::string Message(T const & t) { return DebugPrint(t); } - template string Message(T const & t, ARGS const & ... others) + template std::string Message(T const & t, ARGS const & ... others) { return DebugPrint(t) + " " + Message(others...); } diff --git a/base/levenshtein_dfa.cpp b/base/levenshtein_dfa.cpp index 0586e83390..53912830c4 100644 --- a/base/levenshtein_dfa.cpp +++ b/base/levenshtein_dfa.cpp @@ -3,11 +3,11 @@ #include "base/assert.hpp" #include "base/stl_helpers.hpp" -#include "std/algorithm.hpp" -#include "std/queue.hpp" -#include "std/set.hpp" -#include "std/sstream.hpp" -#include "std/vector.hpp" +#include +#include +#include +#include +#include namespace strings { @@ -78,7 +78,7 @@ private: bool FindRelevant(LevenshteinDFA::Position const & p, UniChar c, size_t & i) const { size_t const limit = - min(m_size - p.m_offset, static_cast(p.m_errorsLeft) + 1); + std::min(m_size - p.m_offset, static_cast(p.m_errorsLeft) + 1); for (i = 0; i < limit; ++i) { @@ -152,7 +152,7 @@ void LevenshteinDFA::State::Normalize() { ASSERT_GREATER(j, 0, ()); --j; - swap(m_positions[i], m_positions[j]); + std::swap(m_positions[i], m_positions[j]); } } @@ -176,8 +176,8 @@ LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t prefixCharsToKeep, ui } m_alphabet.push_back(missed); - queue states; - map visited; + std::queue states; + std::map visited; auto pushState = [&states, &visited, this](State const & state, size_t id) { @@ -231,7 +231,7 @@ LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t prefixCharsToKeep, ui } } -LevenshteinDFA::LevenshteinDFA(string const & s, size_t prefixCharsToKeep, uint8_t maxErrors) +LevenshteinDFA::LevenshteinDFA(std::string const & s, size_t prefixCharsToKeep, uint8_t maxErrors) : LevenshteinDFA(MakeUniString(s), prefixCharsToKeep, maxErrors) { } @@ -241,7 +241,7 @@ LevenshteinDFA::LevenshteinDFA(UniString const & s, uint8_t maxErrors) { } -LevenshteinDFA::LevenshteinDFA(string const & s, uint8_t maxErrors) +LevenshteinDFA::LevenshteinDFA(std::string const & s, uint8_t maxErrors) : LevenshteinDFA(s, 0 /* prefixCharsToKeep */, maxErrors) { } @@ -304,17 +304,17 @@ size_t LevenshteinDFA::Move(size_t s, UniChar c) const return m_transitions[s][i]; } -string DebugPrint(LevenshteinDFA::Position const & p) +std::string DebugPrint(LevenshteinDFA::Position const & p) { - ostringstream os; + std::ostringstream os; os << "Position [" << p.m_offset << ", " << static_cast(p.m_errorsLeft) << ", " << p.m_transposed << "]"; return os.str(); } -string DebugPrint(LevenshteinDFA::State const & s) +std::string DebugPrint(LevenshteinDFA::State const & s) { - ostringstream os; + std::ostringstream os; os << "State ["; for (size_t i = 0; i < s.m_positions.size(); ++i) { diff --git a/base/levenshtein_dfa.hpp b/base/levenshtein_dfa.hpp index 3ba7bbb22c..4edc06022c 100644 --- a/base/levenshtein_dfa.hpp +++ b/base/levenshtein_dfa.hpp @@ -2,8 +2,8 @@ #include "base/string_utils.hpp" -#include "std/cstdint.hpp" -#include "std/vector.hpp" +#include +#include namespace strings { @@ -61,7 +61,7 @@ public: inline bool operator<(State const & rhs) const { return m_positions < rhs.m_positions; } - vector m_positions; + std::vector m_positions; }; // An iterator to the current state in the DFA. @@ -90,9 +90,9 @@ public: }; LevenshteinDFA(UniString const & s, size_t prefixCharsToKeep, uint8_t maxErrors); - LevenshteinDFA(string const & s, size_t prefixCharsToKeep, uint8_t maxErrors); + LevenshteinDFA(std::string const & s, size_t prefixCharsToKeep, uint8_t maxErrors); LevenshteinDFA(UniString const & s, uint8_t maxErrors); - LevenshteinDFA(string const & s, uint8_t maxErrors); + LevenshteinDFA(std::string const & s, uint8_t maxErrors); inline Iterator Begin() const { return Iterator(*this); } @@ -120,12 +120,12 @@ private: size_t const m_size; uint8_t const m_maxErrors; - vector m_alphabet; + std::vector m_alphabet; - vector> m_transitions; - vector m_accepting; + std::vector> m_transitions; + std::vector m_accepting; }; -string DebugPrint(LevenshteinDFA::Position const & p); -string DebugPrint(LevenshteinDFA::State const & s); +std::string DebugPrint(LevenshteinDFA::Position const & p); +std::string DebugPrint(LevenshteinDFA::State const & s); } // namespace strings diff --git a/base/limited_priority_queue.hpp b/base/limited_priority_queue.hpp index 281108ef86..15bf294bf0 100644 --- a/base/limited_priority_queue.hpp +++ b/base/limited_priority_queue.hpp @@ -3,20 +3,20 @@ #include "base/base.hpp" #include "base/assert.hpp" -#include "std/algorithm.hpp" -#include "std/functional.hpp" -#include "std/vector.hpp" +#include +#include +#include namespace my { // Priority queue that stores only N smallest elements. -template > +template > class limited_priority_queue { public: typedef T value_type; - typedef typename vector::const_iterator const_iterator; + typedef typename std::vector::const_iterator const_iterator; explicit limited_priority_queue(size_t maxSize = 1, CompareT compare = CompareT()) : m_maxSize(maxSize == 0 ? 1 : maxSize), m_compare(compare) @@ -79,7 +79,7 @@ public: void reserve(size_t n) { m_queue.reserve(n); } private: - vector m_queue; + std::vector m_queue; size_t m_maxSize; CompareT m_compare; }; diff --git a/base/logging.cpp b/base/logging.cpp index 7af5d1b8ae..5e77051daa 100644 --- a/base/logging.cpp +++ b/base/logging.cpp @@ -5,12 +5,12 @@ #include "base/thread.hpp" #include "base/timer.hpp" -#include "std/iomanip.hpp" -#include "std/iostream.hpp" -#include "std/mutex.hpp" -#include "std/sstream.hpp" +#include +#include +#include +#include #include "std/target_os.hpp" -#include "std/windows.hpp" +//#include "std/windows.hpp" namespace my @@ -18,7 +18,7 @@ namespace my class LogHelper { int m_threadsCount; - map m_threadID; + std::map m_threadID; int GetThreadID() { @@ -43,7 +43,7 @@ namespace my m_names[4] = "CRITICAL"; m_lens[4] = 8; } - void WriteProlog(ostream & s, LogLevel level) + void WriteProlog(std::ostream & s, LogLevel level) { s << "LOG"; @@ -51,33 +51,33 @@ namespace my s << " " << m_names[level]; double const sec = m_timer.ElapsedSeconds(); - s << " " << setfill(' ') << setw(static_cast(16 - m_lens[level])) << sec << " "; + s << " " << std::setfill(' ') << std::setw(static_cast(16 - m_lens[level])) << sec << " "; } }; - mutex g_logMutex; + std::mutex g_logMutex; - void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, string const & msg) + void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, std::string const & msg) { - lock_guard lock(g_logMutex); + std::lock_guard lock(g_logMutex); static LogHelper logger; - ostringstream out; + std::ostringstream out; logger.WriteProlog(out, level); - out << DebugPrint(srcPoint) << msg << endl; + out << DebugPrint(srcPoint) << msg << std::endl; std::cerr << out.str(); CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level)); } - void LogMessageTests(LogLevel level, SrcPoint const &, string const & msg) + void LogMessageTests(LogLevel level, SrcPoint const &, std::string const & msg) { - lock_guard lock(g_logMutex); + std::lock_guard lock(g_logMutex); - ostringstream out; - out << msg << endl; + std::ostringstream out; + out << msg << std::endl; std::cerr << out.str(); CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level)); diff --git a/base/logging.hpp b/base/logging.hpp index 657682d746..678a1b1685 100644 --- a/base/logging.hpp +++ b/base/logging.hpp @@ -4,7 +4,7 @@ #include "base/internal/message.hpp" #include "base/src_point.hpp" -#include "std/atomic.hpp" +#include namespace my { @@ -17,8 +17,8 @@ namespace my LCRITICAL }; - typedef atomic TLogLevel; - typedef void (*LogMessageFn)(LogLevel level, SrcPoint const &, string const &); + using TLogLevel = std::atomic; + typedef void (*LogMessageFn)(LogLevel level, SrcPoint const &, std::string const &); extern LogMessageFn LogMessage; extern TLogLevel g_LogLevel; @@ -27,8 +27,8 @@ namespace my /// @return Pointer to previous message function. LogMessageFn SetLogMessageFn(LogMessageFn fn); - void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, string const & msg); - void LogMessageTests(LogLevel level, SrcPoint const & srcPoint, string const & msg); + void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, std::string const & msg); + void LogMessageTests(LogLevel level, SrcPoint const & srcPoint, std::string const & msg); /// Scope Guard to temporarily suppress specific log level, for example, in unit tests: /// ... diff --git a/base/math.hpp b/base/math.hpp index eb20ca4295..a213d6a2a3 100644 --- a/base/math.hpp +++ b/base/math.hpp @@ -1,11 +1,13 @@ #pragma once #include "base/assert.hpp" -#include "std/algorithm.hpp" #include "std/cmath.hpp" -#include "std/functional.hpp" -#include "std/limits.hpp" -#include "std/type_traits.hpp" + +#include +#include +#include +#include +#include #include @@ -27,8 +29,8 @@ template inline T Abs(T x) template bool AlmostEqualULPs(TFloat x, TFloat y, unsigned int maxULPs = 256) { - static_assert(is_floating_point::value, ""); - static_assert(numeric_limits::is_iec559, ""); + static_assert(std::is_floating_point::value, ""); + static_assert(std::numeric_limits::is_iec559, ""); // Make sure maxUlps is non-negative and small enough that the // default NaN won't compare as equal to anything. @@ -70,7 +72,7 @@ inline bool AlmostEqualAbs(TFloat x, TFloat y, TFloat eps) template inline bool AlmostEqualRel(TFloat x, TFloat y, TFloat eps) { - return fabs(x - y) < eps * max(fabs(x), fabs(y)); + return fabs(x - y) < eps * std::max(fabs(x), fabs(y)); } // Returns true if x and y are equal up to the absolute or relative difference eps. @@ -187,7 +189,7 @@ template T GCD(T a, T b) { if (a == 0 || b == 0) { - gcd = max(a, b); + gcd = std::max(a, b); break; } @@ -207,15 +209,15 @@ template T GCD(T a, T b) if ((a & 0x1) != 0 && (b & 0x1) != 0) { - T const minV = min(a, b); - T const maxV = max(a, b); + T const minV = std::min(a, b); + T const maxV = std::max(a, b); a = (maxV - minV) >> 1; b = minV; continue; } if ((a & 0x1) != 0) - swap(a, b); + std::swap(a, b); a >>= 1; } @@ -228,7 +230,7 @@ template size_t Hash(T1 const & t1, T2 const & t2) { /// @todo Probably, we need better hash for 2 integral types. - return (hash()(t1) ^ (hash()(t2) << 1)); + return (std::hash()(t1) ^ (std::hash()(t2) << 1)); } } diff --git a/base/matrix.hpp b/base/matrix.hpp index 9733bb99a5..63df382938 100644 --- a/base/matrix.hpp +++ b/base/matrix.hpp @@ -2,8 +2,8 @@ #include "base/math.hpp" -#include "std/iomanip.hpp" -#include "std/initializer_list.hpp" +#include +#include namespace math @@ -27,10 +27,10 @@ namespace math copy(data, data + Rows * Cols, m_data); } - Matrix(initializer_list const & initList) + Matrix(std::initializer_list const & initList) { ASSERT(initList.size() == Rows * Cols, ()); - copy(initList.begin(), initList.end(), m_data); + std::copy(initList.begin(), initList.end(), m_data); } template @@ -196,17 +196,17 @@ namespace math return res; } - template string DebugPrint(Matrix const & m) + template std::string DebugPrint(Matrix const & m) { - ostringstream ss; + std::ostringstream ss; - ss << ":" << endl; + ss << ":" << std::endl; for (unsigned i = 0; i < M; ++i) { for (unsigned j = 0; j < N; ++j) - ss << setfill(' ') << setw(10) << m(i, j) << " "; - ss << endl; + ss << std::setfill(' ') << std::setw(10) << m(i, j) << " "; + ss << std::endl; } return ss.str(); diff --git a/base/mem_trie.hpp b/base/mem_trie.hpp index 7c2a0eb7f2..46affa1cdc 100644 --- a/base/mem_trie.hpp +++ b/base/mem_trie.hpp @@ -2,8 +2,8 @@ #include "base/macros.hpp" -#include "std/map.hpp" -#include "std/vector.hpp" +#include +#include namespace my { @@ -47,7 +47,7 @@ public: void ForEach(ToDo && toDo) { TString prefix; - ForEach(&m_root, prefix, forward(toDo)); + ForEach(&m_root, prefix, std::forward(toDo)); } template @@ -55,7 +55,7 @@ public: { Node const * node = MoveTo(prefix); if (node) - ForEach(node, prefix, forward(toDo)); + ForEach(node, prefix, std::forward(toDo)); } size_t GetNumNodes() const { return m_numNodes; } @@ -91,8 +91,8 @@ private: void AddValue(TValue const & value) { m_values.push_back(value); } - map m_moves; - vector m_values; + std::map m_moves; + std::vector m_values; DISALLOW_COPY(Node); }; diff --git a/base/newtype.hpp b/base/newtype.hpp index 5d435eda24..f9306c3ae7 100644 --- a/base/newtype.hpp +++ b/base/newtype.hpp @@ -1,21 +1,21 @@ #pragma once -#include "std/iostream.hpp" -#include "std/type_traits.hpp" +#include +#include namespace my { namespace impl { template -using IsConvertibleGuard = typename enable_if::value>::type *; +using IsConvertibleGuard = typename std::enable_if::value>::type *; } // namespace impl /// Creates a typesafe alias to a given numeric Type. template class NewType { - static_assert(is_integral::value || is_floating_point::value, + static_assert(std::is_integral::value || std::is_floating_point::value, "NewType can be used only with integral and floating point type."); public: diff --git a/base/object_tracker.cpp b/base/object_tracker.cpp deleted file mode 100644 index acad6d0a15..0000000000 --- a/base/object_tracker.cpp +++ /dev/null @@ -1,81 +0,0 @@ -#include "base/object_tracker.hpp" -#include "base/assert.hpp" -#include "base/logging.hpp" - -#include "std/target_os.hpp" - -#ifndef OMIM_OS_WINDOWS - #include - #include -#else - #include "std/windows.hpp" -#endif - - -namespace dbg -{ - -map ObjectTracker::m_map; -size_t ObjectTracker::m_counter = 0; - -#ifdef TRACKER_MULTITHREADED -threads::Mutex ObjectTracker::m_mutex; -#endif - -void ObjectTracker::Add(void * p) -{ -#ifdef TRACKER_MULTITHREADED - threads::MutexGuard guard(m_mutex); -#endif - - CHECK ( m_map.insert(make_pair(p, m_counter++)).second == true, (p) ); -} - -void ObjectTracker::Remove(void * p) -{ -#ifdef TRACKER_MULTITHREADED - threads::MutexGuard guard(m_mutex); -#endif - - CHECK ( m_map.erase(p) == 1, (p) ); -} - -ObjectTracker::ObjectTracker() -{ - Add(this); -} - -ObjectTracker::ObjectTracker(ObjectTracker const &) -{ - Add(this); -} - -ObjectTracker::~ObjectTracker() -{ - Remove(this); -} - -void ObjectTracker::PrintLeaks() -{ -#ifdef TRACKER_MULTITHREADED - threads::MutexGuard guard(m_mutex); -#endif - - if (m_map.empty()) - LOG(LINFO, ("No leaks found!")); - else - LOG(LINFO, ("Leaks map:", m_map)); -} - -void BreakIntoDebugger() -{ - /// @todo Probably we can make it more simple (like std::terminate). - -#if defined(OMIM_OS_WINDOWS) - DebugBreak(); -#else - kill(getpid(), SIGINT); -#endif -} - -} diff --git a/base/object_tracker.hpp b/base/object_tracker.hpp deleted file mode 100644 index 377f511e96..0000000000 --- a/base/object_tracker.hpp +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include "base/base.hpp" -#include "base/mutex.hpp" - -#include "std/map.hpp" - - -#define TRACKER_MULTITHREADED - -namespace dbg -{ - class ObjectTracker - { - /// Pointer -> Info (Serial number of creation) - static map m_map; - static size_t m_counter; - -#ifdef TRACKER_MULTITHREADED - static threads::Mutex m_mutex; -#endif - - static void Add(void *); - static void Remove(void *); - - public: - ObjectTracker(); - ObjectTracker(ObjectTracker const & rhs); - ~ObjectTracker(); - - static void PrintLeaks(); - }; - - void BreakIntoDebugger(); -} diff --git a/base/observer_list.hpp b/base/observer_list.hpp index 04aab44b9b..0599a15ead 100644 --- a/base/observer_list.hpp +++ b/base/observer_list.hpp @@ -2,9 +2,9 @@ #include "base/logging.hpp" -#include "std/algorithm.hpp" -#include "std/mutex.hpp" -#include "std/vector.hpp" +#include +#include +#include namespace my { @@ -16,7 +16,7 @@ class ObserverList public: bool Add(TObserver & observer) { - lock_guard lock(m_observersLock); + std::lock_guard lock(m_observersLock); auto const it = find(m_observers.begin(), m_observers.end(), &observer); if (it != m_observers.end()) { @@ -29,7 +29,7 @@ public: bool Remove(TObserver const & observer) { - lock_guard lock(m_observersLock); + std::lock_guard lock(m_observersLock); auto const it = find(m_observers.begin(), m_observers.end(), &observer); if (it == m_observers.end()) { @@ -43,13 +43,13 @@ public: template void ForEach(F fn, Args const &... args) { - lock_guard lock(m_observersLock); + std::lock_guard lock(m_observersLock); for (TObserver * observer : m_observers) (observer->*fn)(args...); } private: - vector m_observers; - mutex m_observersLock; + std::vector m_observers; + std::mutex m_observersLock; }; } // namespace my diff --git a/base/range_iterator.hpp b/base/range_iterator.hpp index 7f2ee7ca3a..26e5270a98 100644 --- a/base/range_iterator.hpp +++ b/base/range_iterator.hpp @@ -1,7 +1,7 @@ #pragma once -#include "std/iterator.hpp" -#include "std/type_traits.hpp" +#include +#include namespace my { diff --git a/base/ref_counted.hpp b/base/ref_counted.hpp index 54feffc08b..c63d388568 100644 --- a/base/ref_counted.hpp +++ b/base/ref_counted.hpp @@ -2,8 +2,8 @@ #include "base/macros.hpp" -#include "std/cstdint.hpp" -#include "std/unique_ptr.hpp" +#include +#include namespace my { @@ -36,15 +36,15 @@ public: m_p->IncRef(); } - explicit RefCountPtr(unique_ptr p) noexcept : RefCountPtr(p.release()) {} + explicit RefCountPtr(std::unique_ptr p) noexcept : RefCountPtr(p.release()) {} RefCountPtr(RefCountPtr const & rhs) { *this = rhs; } - RefCountPtr(RefCountPtr && rhs) { *this = move(rhs); } + RefCountPtr(RefCountPtr && rhs) { *this = std::move(rhs); } ~RefCountPtr() { Reset(); } - RefCountPtr & operator=(unique_ptr p) + RefCountPtr & operator=(std::unique_ptr p) { Reset(); diff --git a/base/set_operations.hpp b/base/set_operations.hpp index 4b28d93edf..a65a33629b 100644 --- a/base/set_operations.hpp +++ b/base/set_operations.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/algorithm.hpp" +#include // Similar to set_difference(), but if element is present n times in the first sequence and once in // the second sequence, all n copies are filtered, insted of one. @@ -29,5 +29,5 @@ OutIterT SetDifferenceUnlimited(Iter1T beg1, Iter1T end1, // ++beg2; } } - return copy(beg1, end1, out); + return std::copy(beg1, end1, out); } diff --git a/base/shared_buffer_manager.cpp b/base/shared_buffer_manager.cpp index 0e530e627f..1e5a33b085 100644 --- a/base/shared_buffer_manager.cpp +++ b/base/shared_buffer_manager.cpp @@ -20,7 +20,7 @@ SharedBufferManager::shared_buffer_ptr_t SharedBufferManager::reserveSharedBuffe shared_buffer_ptr_list_t & l = m_sharedBuffers[s]; if (l.empty()) - l.push_back(make_shared(s)); + l.push_back(std::make_shared(s)); shared_buffer_ptr_t res = l.front(); l.pop_front(); diff --git a/base/shared_buffer_manager.hpp b/base/shared_buffer_manager.hpp index c73b9d9215..42a6da9aa2 100644 --- a/base/shared_buffer_manager.hpp +++ b/base/shared_buffer_manager.hpp @@ -1,18 +1,19 @@ #pragma once #include "base/mutex.hpp" -#include "std/vector.hpp" -#include "std/shared_ptr.hpp" -#include "std/list.hpp" -#include "std/map.hpp" + +#include +#include +#include +#include class SharedBufferManager { public: - typedef vector shared_buffer_t; - typedef shared_ptr shared_buffer_ptr_t; - typedef list shared_buffer_ptr_list_t; - typedef map shared_buffers_t; + typedef std::vector shared_buffer_t; + typedef std::shared_ptr shared_buffer_ptr_t; + typedef std::list shared_buffer_ptr_list_t; + typedef std::map shared_buffers_t; private: threads::Mutex m_mutex; diff --git a/base/src_point.cpp b/base/src_point.cpp index 54b8976c18..663054f229 100644 --- a/base/src_point.cpp +++ b/base/src_point.cpp @@ -1,7 +1,7 @@ #include "base/src_point.hpp" -#include "std/algorithm.hpp" -#include "std/sstream.hpp" +#include +#include namespace my @@ -15,7 +15,7 @@ void SrcPoint::TruncateFileName() { if (m_fileName[i] == '\\' || m_fileName[i] == '/') { - swap(p[0], p[1]); + std::swap(p[0], p[1]); p[0] = m_fileName + i + 1; } } @@ -24,9 +24,9 @@ void SrcPoint::TruncateFileName() } // namespace my -string DebugPrint(my::SrcPoint const & srcPoint) +std::string DebugPrint(my::SrcPoint const & srcPoint) { - ostringstream out; + std::ostringstream out; if (srcPoint.Line() > 0) out << srcPoint.FileName() << ":" << srcPoint.Line() << " " << srcPoint.Function() << srcPoint.Postfix() << " "; diff --git a/base/src_point.hpp b/base/src_point.hpp index d7552deba3..2d46d0af56 100644 --- a/base/src_point.hpp +++ b/base/src_point.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/string.hpp" +#include #ifndef SRC_LOGGING @@ -63,4 +63,4 @@ namespace my }; } -string DebugPrint(my::SrcPoint const & srcPoint); +std::string DebugPrint(my::SrcPoint const & srcPoint); diff --git a/base/stats.hpp b/base/stats.hpp index 93982659f3..590c296ed4 100644 --- a/base/stats.hpp +++ b/base/stats.hpp @@ -1,8 +1,8 @@ #pragma once #include "base/base.hpp" -#include "std/sstream.hpp" -#include "std/string.hpp" +#include +#include namespace my @@ -13,7 +13,7 @@ template class NoopStats public: NoopStats() {} inline void operator() (T const &) {} - inline string GetStatsStr() const { return ""; } + inline std::string GetStatsStr() const { return ""; } }; template class AverageStats @@ -29,7 +29,7 @@ public: string GetStatsStr() const { - ostringstream out; + std::ostringstream out; out << "N: " << m_Count; if (m_Count > 0) out << " Av: " << m_Sum / m_Count; diff --git a/base/std_serialization.hpp b/base/std_serialization.hpp index b9767d8634..87dc188668 100644 --- a/base/std_serialization.hpp +++ b/base/std_serialization.hpp @@ -2,26 +2,26 @@ #include "base/base.hpp" -#include "std/map.hpp" -#include "std/set.hpp" -#include "std/unordered_map.hpp" -#include "std/vector.hpp" -#include "std/array.hpp" -#include "std/utility.hpp" +#include +#include +#include +#include +#include +#include /// @name std containers serialization /// TArchive should be an archive class in global namespace. //@{ template -TArchive & operator << (TArchive & ar, pair const & t) +TArchive & operator << (TArchive & ar, std::pair const & t) { ar << t.first << t.second; return ar; } template -TArchive & operator >> (TArchive & ar, pair & t) +TArchive & operator >> (TArchive & ar, std::pair & t) { ar >> t.first >> t.second; return ar; @@ -100,74 +100,74 @@ template void load_like_set(TArchive & ar, TCont & } } -template TArchive & operator << (TArchive & ar, map const & rMap) +template TArchive & operator << (TArchive & ar, std::map const & rMap) { save_like_map(ar, rMap); return ar; } -template TArchive & operator >> (TArchive & ar, map & rMap) +template TArchive & operator >> (TArchive & ar, std::map & rMap) { load_like_map(ar, rMap); return ar; } -template TArchive & operator << (TArchive & ar, multimap const & rMap) +template TArchive & operator << (TArchive & ar, std::multimap const & rMap) { save_like_map(ar, rMap); return ar; } -template TArchive & operator >> (TArchive & ar, multimap & rMap) +template TArchive & operator >> (TArchive & ar, std::multimap & rMap) { load_like_map(ar, rMap); return ar; } -template TArchive & operator << (TArchive & ar, unordered_map const & rMap) +template TArchive & operator << (TArchive & ar, std::unordered_map const & rMap) { save_like_map(ar, rMap); return ar; } -template TArchive & operator >> (TArchive & ar, unordered_map & rMap) +template TArchive & operator >> (TArchive & ar, std::unordered_map & rMap) { load_like_map(ar, rMap); return ar; } -template TArchive & operator << (TArchive & ar, vector const & rVector) +template TArchive & operator << (TArchive & ar, std::vector const & rVector) { save_like_vector(ar, rVector); return ar; } -template TArchive & operator >> (TArchive & ar, vector & rVector) +template TArchive & operator >> (TArchive & ar, std::vector & rVector) { load_like_vector(ar, rVector); return ar; } -template TArchive & operator << (TArchive & ar, set const & rSet) +template TArchive & operator << (TArchive & ar, std::set const & rSet) { save_like_set(ar, rSet); return ar; } -template TArchive & operator >> (TArchive & ar, set & rSet) +template TArchive & operator >> (TArchive & ar, std::set & rSet) { load_like_set(ar, rSet); return ar; } -template TArchive & operator << (TArchive & ar, array const & rArray) +template TArchive & operator << (TArchive & ar, std::array const & rArray) { for (size_t i = 0; i < N; ++i) ar << rArray[i]; return ar; } -template TArchive & operator >> (TArchive & ar, array & rArray) +template TArchive & operator >> (TArchive & ar, std::array & rArray) { for (size_t i = 0; i < N; ++i) ar >> rArray[i]; @@ -179,7 +179,7 @@ namespace serial { /// @name This functions invokes overriten do_load for type T with index in array. //@{ - template void do_load(TArchive & ar, size_t ind, vector & rVector) + template void do_load(TArchive & ar, size_t ind, std::vector & rVector) { uint32_t count; ar >> count; @@ -189,7 +189,7 @@ namespace serial do_load(ar, ind, rVector[i]); } - template void do_load(TArchive & ar, array & rArray) + template void do_load(TArchive & ar, std::array & rArray) { for (size_t i = 0; i < N; ++i) do_load(ar, i, rArray[i]); diff --git a/base/stl_add.hpp b/base/stl_add.hpp index 8ccfdffa53..d30c16d2b8 100644 --- a/base/stl_add.hpp +++ b/base/stl_add.hpp @@ -1,7 +1,19 @@ #pragma once -#include "std/functional.hpp" -#include "std/iterator.hpp" -#include "std/algorithm.hpp" + +#include +#include +#include + +namespace my +{ +/// @todo(y): replace this hand-written helper function by +/// std::make_unique when it will be available in C++14 +template +std::unique_ptr make_unique(Args &&... args) +{ + return std::unique_ptr(new T(std::forward(args)...)); +} +} template class BackInsertFunctor @@ -80,7 +92,7 @@ IterT RemoveIfKeepValid(IterT beg, IterT end, CompareT comp) { if (!comp(*end)) { - swap(*beg, *end); + std::swap(*beg, *end); ++beg; break; } @@ -96,12 +108,12 @@ IterT RemoveIfKeepValid(IterT beg, IterT end, CompareT comp) template inline bool IsSorted(IterT beg, IterT end) { - return IsSorted(beg, end, less::value_type>()); + return IsSorted(beg, end, std::less::value_type>()); } template inline bool IsSortedAndUnique(IterT beg, IterT end) { - return IsSortedAndUnique(beg, end, less::value_type>()); + return IsSortedAndUnique(beg, end, std::less::value_type>()); } struct DeleteFunctor @@ -186,7 +198,7 @@ template void AccumulateIntervals1With2(IterT1 b1, IterT1 e1, IterT2 b2, IterT2 e2, InsertIterT res) { //typedef typename iterator_traits::value_type T; - typedef typename iterator_traits::value_type T; + typedef typename std::iterator_traits::value_type T; T prev; bool validPrev = false; diff --git a/base/stl_helpers.hpp b/base/stl_helpers.hpp index 3a667766de..7f39e39a59 100644 --- a/base/stl_helpers.hpp +++ b/base/stl_helpers.hpp @@ -1,9 +1,9 @@ #pragma once -#include "std/algorithm.hpp" -#include "std/functional.hpp" -#include "std/utility.hpp" -#include "std/vector.hpp" +#include +#include +#include +#include namespace my { @@ -93,14 +93,14 @@ void SortUnique(Cont & c) template void SortUnique(Cont & c, Less && less, Equals && equals) { - sort(c.begin(), c.end(), forward(less)); - c.erase(unique(c.begin(), c.end(), forward(equals)), c.end()); + sort(c.begin(), c.end(), std::forward(less)); + c.erase(unique(c.begin(), c.end(), std::forward(equals)), c.end()); } template void EraseIf(Cont & c, Fn && fn) { - c.erase(remove_if(c.begin(), c.end(), forward(fn)), c.end()); + c.erase(remove_if(c.begin(), c.end(), std::forward(fn)), c.end()); } // Creates a comparer being able to compare two instances of class C diff --git a/base/stl_iterator.hpp b/base/stl_iterator.hpp index 153c6436fa..a409f08b5f 100644 --- a/base/stl_iterator.hpp +++ b/base/stl_iterator.hpp @@ -1,6 +1,6 @@ #pragma once -#include "std/iterator_facade.hpp" +#include namespace detail { @@ -11,7 +11,7 @@ struct Dummy } class CounterIterator : - public iterator_facade + public boost::iterator_facade { size_t m_count; public: diff --git a/base/string_format.cpp b/base/string_format.cpp index 86a7447743..7f4c7019a1 100644 --- a/base/string_format.cpp +++ b/base/string_format.cpp @@ -1,21 +1,21 @@ #include "base/string_format.hpp" -#include "std/list.hpp" +#include namespace strings { - string const FormatImpl(string const & s, string arr[], size_t count) + std::string const FormatImpl(std::string const & s, std::string arr[], size_t count) { size_t offs = 0; - list fieldOffs; + std::list fieldOffs; - string res = s; + std::string res = s; while (true) { offs = res.find("^", offs); - if (offs == string::npos) + if (offs == std::string::npos) break; else { @@ -34,7 +34,7 @@ namespace strings offs = 0; size_t i = 0; - for (list::const_iterator offsIt = fieldOffs.begin(); + for (std::list::const_iterator offsIt = fieldOffs.begin(); (offsIt != fieldOffs.end()) && (i < count); ++offsIt, ++i) { diff --git a/base/string_format.hpp b/base/string_format.hpp index 05875cac48..a5186fcbaa 100644 --- a/base/string_format.hpp +++ b/base/string_format.hpp @@ -2,56 +2,56 @@ #include "base/base.hpp" #include "base/macros.hpp" -#include "std/string.hpp" -#include "std/sstream.hpp" +#include +#include namespace strings { template - string ToString(T const & t) + std::string ToString(T const & t) { // May be we should use DebugPrint here. Not sure. - ostringstream out; + std::ostringstream out; out << t; return out.str(); } - string const FormatImpl(string const & s, string arr[], size_t count); + std::string const FormatImpl(std::string const & s, std::string arr[], size_t count); template - string const Format(string const & s, T1 const & t1) + std::string const Format(std::string const & s, T1 const & t1) { - string arr[] = { ToString(t1) }; + std::string arr[] = { ToString(t1) }; return FormatImpl(s, arr, ARRAY_SIZE(arr)); } template - string const Format(string const & s, T1 const & t1, T2 const & t2) + std::string const Format(std::string const & s, T1 const & t1, T2 const & t2) { - string arr[] = { ToString(t1), ToString(t2) }; + std::string arr[] = { ToString(t1), ToString(t2) }; return FormatImpl(s, arr, ARRAY_SIZE(arr)); } template - string const Format(string const & s, T1 const & t1, T2 const & t2, T3 const & t3) + std::string const Format(std::string const & s, T1 const & t1, T2 const & t2, T3 const & t3) { - string arr[] = { ToString(t1), ToString(t2), ToString(t3) }; + std::string arr[] = { ToString(t1), ToString(t2), ToString(t3) }; return FormatImpl(s, arr, ARRAY_SIZE(arr)); } template - string const Format(string const & s, T1 const & t1, T2 const & t2, T3 const & t3, T4 const & t4) + std::string const Format(std::string const & s, T1 const & t1, T2 const & t2, T3 const & t3, T4 const & t4) { - string arr[] = { ToString(t1), ToString(t2), ToString(t3), ToString(t4) }; + std::string arr[] = { ToString(t1), ToString(t2), ToString(t3), ToString(t4) }; return FormatImpl(s, arr, ARRAY_SIZE(arr)); } template - string const Format(string const & s, T1 const & t1, T2 const & t2, T3 const & t3, T4 const & t4, T5 const & t5) + std::string const Format(std::string const & s, T1 const & t1, T2 const & t2, T3 const & t3, T4 const & t4, T5 const & t5) { - string arr[] = { ToString(t1), ToString(t2), ToString(t3), ToString(t4), ToString(t5) }; + std::string arr[] = { ToString(t1), ToString(t2), ToString(t3), ToString(t4), ToString(t5) }; return FormatImpl(s, arr, ARRAY_SIZE(arr)); } } diff --git a/base/string_utils.cpp b/base/string_utils.cpp index 67eed2cb12..6379deab9e 100644 --- a/base/string_utils.cpp +++ b/base/string_utils.cpp @@ -1,25 +1,26 @@ #include "base/assert.hpp" #include "base/string_utils.hpp" -#include "std/algorithm.hpp" -#include "std/cmath.hpp" -#include "std/iomanip.hpp" -#include "std/iterator.hpp" #include "std/target_os.hpp" +#include +#include +#include +#include + #include namespace strings { bool UniString::IsEqualAscii(char const * s) const { - return (size() == strlen(s) && equal(begin(), end(), s)); + return (size() == strlen(s) && std::equal(begin(), end(), s)); } SimpleDelimiter::SimpleDelimiter(char const * delims) { - string const s(delims); - string::const_iterator it = s.begin(); + std::string const s(delims); + std::string::const_iterator it = s.begin(); while (it != s.end()) m_delims.push_back(utf8::unchecked::next(it)); } @@ -31,14 +32,14 @@ SimpleDelimiter::SimpleDelimiter(char delim) bool SimpleDelimiter::operator()(UniChar c) const { - return find(m_delims.begin(), m_delims.end(), c) != m_delims.end(); + return std::find(m_delims.begin(), m_delims.end(), c) != m_delims.end(); } -UniChar LastUniChar(string const & s) +UniChar LastUniChar(std::string const & s) { if (s.empty()) return 0; - utf8::unchecked::iterator iter(s.end()); + utf8::unchecked::iterator iter(s.end()); --iter; return *iter; } @@ -117,18 +118,18 @@ UniString MakeLowerCase(UniString const & s) return result; } -void MakeLowerCaseInplace(string & s) +void MakeLowerCaseInplace(std::string & s) { UniString uniStr; - utf8::unchecked::utf8to32(s.begin(), s.end(), back_inserter(uniStr)); + utf8::unchecked::utf8to32(s.begin(), s.end(), std::back_inserter(uniStr)); MakeLowerCaseInplace(uniStr); s.clear(); utf8::unchecked::utf32to8(uniStr.begin(), uniStr.end(), back_inserter(s)); } -string MakeLowerCase(string const & s) +std::string MakeLowerCase(std::string const & s) { - string result(s); + std::string result(s); MakeLowerCaseInplace(result); return result; } @@ -140,7 +141,7 @@ UniString Normalize(UniString const & s) return result; } -void NormalizeDigits(string & utf8) +void NormalizeDigits(std::string & utf8) { size_t const n = utf8.size(); size_t const m = n >= 2 ? n - 2 : 0; @@ -204,29 +205,29 @@ char ascii_to_lower(char in) } } -void AsciiToLower(string & s) { transform(s.begin(), s.end(), s.begin(), &ascii_to_lower); } -void Trim(string & s) { boost::trim(s); } -void Trim(string & s, char const * anyOf) { boost::trim_if(s, boost::is_any_of(anyOf)); } -bool EqualNoCase(string const & s1, string const & s2) +void AsciiToLower(std::string & s) { transform(s.begin(), s.end(), s.begin(), &ascii_to_lower); } +void Trim(std::string & s) { boost::trim(s); } +void Trim(std::string & s, char const * anyOf) { boost::trim_if(s, boost::is_any_of(anyOf)); } +bool EqualNoCase(std::string const & s1, std::string const & s2) { return MakeLowerCase(s1) == MakeLowerCase(s2); } -UniString MakeUniString(string const & utf8s) +UniString MakeUniString(std::string const & utf8s) { UniString result; - utf8::unchecked::utf8to32(utf8s.begin(), utf8s.end(), back_inserter(result)); + utf8::unchecked::utf8to32(utf8s.begin(), utf8s.end(), std::back_inserter(result)); return result; } -string ToUtf8(UniString const & s) +std::string ToUtf8(UniString const & s) { - string result; + std::string result; utf8::unchecked::utf32to8(s.begin(), s.end(), back_inserter(result)); return result; } -bool IsASCIIString(string const & str) +bool IsASCIIString(std::string const & str) { for (size_t i = 0; i < str.size(); ++i) if (str[i] & 0x80) @@ -248,8 +249,8 @@ bool StartsWith(UniString const & s, UniString const & p) return true; } -bool StartsWith(string const & s1, char const * s2) { return (s1.compare(0, strlen(s2), s2) == 0); } -bool EndsWith(string const & s1, char const * s2) +bool StartsWith(std::string const & s1, char const * s2) { return (s1.compare(0, strlen(s2), s2) == 0); } +bool EndsWith(std::string const & s1, char const * s2) { size_t const n = s1.size(); size_t const m = strlen(s2); @@ -258,29 +259,29 @@ bool EndsWith(string const & s1, char const * s2) return (s1.compare(n - m, m, s2) == 0); } -bool EndsWith(string const & s1, string const & s2) +bool EndsWith(std::string const & s1, std::string const & s2) { return s1.size() >= s2.size() && s1.compare(s1.size() - s2.size(), s2.size(), s2) == 0; } -string to_string_dac(double d, int dac) +std::string to_string_dac(double d, int dac) { - dac = min(numeric_limits::digits10, dac); + dac = std::min(std::numeric_limits::digits10, dac); - ostringstream ss; + std::ostringstream ss; if (d < 1. && d > -1.) { - string res; + std::string res; if (d >= 0.) { - ss << setprecision(dac + 1) << d + 1; + ss << std::setprecision(dac + 1) << d + 1; res = ss.str(); res[0] = '0'; } else { - ss << setprecision(dac + 1) << d - 1; + ss << std::setprecision(dac + 1) << d - 1; res = ss.str(); res[1] = '0'; } @@ -289,19 +290,19 @@ string to_string_dac(double d, int dac) // Calc digits before comma (log10). double fD = fabs(d); - while (fD >= 1.0 && dac < numeric_limits::digits10) + while (fD >= 1.0 && dac < std::numeric_limits::digits10) { fD /= 10.0; ++dac; } - ss << setprecision(dac) << d; + ss << std::setprecision(dac) << d; return ss.str(); } -bool IsHTML(string const & utf8) +bool IsHTML(std::string const & utf8) { - string::const_iterator it = utf8.begin(); + std::string::const_iterator it = utf8.begin(); size_t ltCount = 0; size_t gtCount = 0; while (it != utf8.end()) @@ -315,15 +316,15 @@ bool IsHTML(string const & utf8) return (ltCount > 0 && gtCount > 0); } -bool AlmostEqual(string const & str1, string const & str2, size_t mismatchedCount) +bool AlmostEqual(std::string const & str1, std::string const & str2, size_t mismatchedCount) { - pair mis(str1.begin(), str2.begin()); + std::pair mis(str1.begin(), str2.begin()); auto const str1End = str1.end(); auto const str2End = str2.end(); for (size_t i = 0; i <= mismatchedCount; ++i) { - auto const end = mis.first + min(distance(mis.first, str1End), distance(mis.second, str2End)); + auto const end = mis.first + std::min(distance(mis.first, str1End), distance(mis.second, str2End)); mis = mismatch(mis.first, end, mis.second); if (mis.first == str1End && mis.second == str2End) return true; @@ -335,13 +336,13 @@ bool AlmostEqual(string const & str1, string const & str2, size_t mismatchedCoun return false; } -void ParseCSVRow(string const & s, char const delimiter, vector & target) +void ParseCSVRow(std::string const & s, char const delimiter, std::vector & target) { target.clear(); - using It = TokenizeIterator; + using It = TokenizeIterator; for (It it(s, SimpleDelimiter(delimiter)); it; ++it) { - string column = *it; + std::string column = *it; strings::Trim(column); target.push_back(move(column)); } diff --git a/base/string_utils.hpp b/base/string_utils.hpp index 8a9c925ef4..af8670c5a4 100644 --- a/base/string_utils.hpp +++ b/base/string_utils.hpp @@ -3,14 +3,14 @@ #include "base/buffer_vector.hpp" #include "base/stl_add.hpp" -#include "std/algorithm.hpp" -#include "std/cstdint.hpp" -#include "std/iterator.hpp" -#include "std/limits.hpp" -#include "std/regex.hpp" -#include "std/sstream.hpp" -#include "std/string.hpp" -#include "std/type_traits.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include "3party/utfcpp/source/utf8/unchecked.h" @@ -63,7 +63,7 @@ void NormalizeInplace(UniString & s); UniString Normalize(UniString const & s); /// Replaces "full width" unicode digits with ascii ones. -void NormalizeDigits(string & utf8); +void NormalizeDigits(std::string & utf8); void NormalizeDigits(UniString & us); /// Counts number of start symbols in string s (that is not lower and not normalized) that maches @@ -72,37 +72,37 @@ void NormalizeDigits(UniString & us); /// For implementation @see base/lower_case.cpp size_t CountNormLowerSymbols(UniString const & s, UniString const & lowStr); -void AsciiToLower(string & s); +void AsciiToLower(std::string & s); // TODO(AlexZ): current boost impl uses default std::locale() to trim. // In general, it does not work for any unicode whitespace except ASCII U+0020 one. -void Trim(string & s); +void Trim(std::string & s); /// Remove any characters that contain in "anyOf" on left and right side of string s -void Trim(string & s, char const * anyOf); +void Trim(std::string & s, char const * anyOf); -void MakeLowerCaseInplace(string & s); -string MakeLowerCase(string const & s); -bool EqualNoCase(string const & s1, string const & s2); +void MakeLowerCaseInplace(std::string & s); +std::string MakeLowerCase(std::string const & s); +bool EqualNoCase(std::string const & s1, std::string const & s2); -UniString MakeUniString(string const & utf8s); -string ToUtf8(UniString const & s); -bool IsASCIIString(string const & str); +UniString MakeUniString(std::string const & utf8s); +std::string ToUtf8(UniString const & s); +bool IsASCIIString(std::string const & str); bool IsASCIIDigit(UniChar c); bool IsASCIILatin(UniChar c); -inline string DebugPrint(UniString const & s) { return ToUtf8(s); } +inline std::string DebugPrint(UniString const & s) { return ToUtf8(s); } template class TokenizeIterator { public: using difference_type = std::ptrdiff_t; - using value_type = string; + using value_type = std::string; using pointer = void; - using reference = string; + using reference = std::string; using iterator_category = std::input_iterator_tag; // *NOTE* |s| must be not temporary! - TokenizeIterator(string const & s, TDelimFn const & delimFn) + TokenizeIterator(std::string const & s, TDelimFn const & delimFn) : m_start(s.begin()), m_end(s.begin()), m_finish(s.end()), m_delimFn(delimFn) { Move(); @@ -115,10 +115,10 @@ public: Move(); } - string operator*() const + std::string operator*() const { ASSERT(m_start != m_finish, ("Dereferencing of empty iterator.")); - return string(m_start.base(), m_end.base()); + return std::string(m_start.base(), m_end.base()); } UniString GetUniString() const @@ -181,13 +181,13 @@ class TokenizeIterator { public: using difference_type = std::ptrdiff_t; - using value_type = string; + using value_type = std::string; using pointer = void; - using reference = string; + using reference = std::string; using iterator_category = std::input_iterator_tag; // *NOTE* |s| must be not temporary! - TokenizeIterator(string const & s, TDelimFn const & delimFn) + TokenizeIterator(std::string const & s, TDelimFn const & delimFn) : m_start(s.begin()), m_end(s.begin()), m_finish(s.end()), m_delimFn(delimFn), m_finished(false) { while (m_end != m_finish && !m_delimFn(*m_end)) @@ -202,10 +202,10 @@ public: ++m_end; } - string operator*() const + std::string operator*() const { ASSERT(!m_finished, ("Dereferencing of empty iterator.")); - return string(m_start.base(), m_end.base()); + return std::string(m_start.base(), m_end.base()); } UniString GetUniString() const @@ -291,14 +291,14 @@ public: }; using SimpleTokenizer = - TokenizeIterator, + TokenizeIterator, false /* KeepEmptyTokens */>; using SimpleTokenizerWithEmptyTokens = - TokenizeIterator, + TokenizeIterator, true /* KeepEmptyTokens */>; template -void Tokenize(string const & str, char const * delims, TFunctor && f) +void Tokenize(std::string const & str, char const * delims, TFunctor && f) { SimpleTokenizer iter(str, delims); while (iter) @@ -308,23 +308,23 @@ void Tokenize(string const & str, char const * delims, TFunctor && f) } } -template