Conflicts: algorithms_cpp/test/count_test.cc base_c/include/embb/base/c/internal/platform.h base_c/test/alloc_test.h base_c/test/condition_var_test.h base_c/test/core_set_test.h base_c/test/counter_test.h base_c/test/duration_test.h base_c/test/thread_index_test.h base_c/test/thread_specific_storage_test.h base_c/test/thread_test.h base_c/test/time_test.h base_cpp/include/embb/base/core_set.h base_cpp/include/embb/base/duration.h base_cpp/include/embb/base/exceptions.h base_cpp/include/embb/base/internal/duration-inl.h base_cpp/include/embb/base/internal/mutex-inl.h base_cpp/include/embb/base/internal/thread-inl.h base_cpp/include/embb/base/internal/thread_closures.h base_cpp/include/embb/base/internal/thread_specific_storage-inl.h base_cpp/include/embb/base/thread_specific_storage.h base_cpp/include/embb/base/time.h base_cpp/test/thread_test.h dataflow_cpp/include/embb/dataflow/internal/inputs.h
