diff options
| author | Vincent Rouvreau <10407034+VincentRouvreau@users.noreply.github.com> | 2020-03-17 22:51:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 22:51:12 +0100 |
| commit | 2ec0ac1f006577d520accbe605a61fc10ede3352 (patch) | |
| tree | 48abfabebccc3e529737ae5145b41a7d56b5b0e5 /src/Simplex_tree/include/gudhi | |
| parent | 5fdbad3fdd350edc3a5340110f4c5332c73517b3 (diff) | |
| parent | b262406b0a75e39276c11f70ef1174981aa31b51 (diff) | |
Merge pull request #253 from VincentRouvreau/remove_workarounds
Remove workarounds
Diffstat (limited to 'src/Simplex_tree/include/gudhi')
| -rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index b7fb9002..2adc8354 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -765,12 +765,7 @@ class Simplex_tree { if (first == last) return { null_simplex(), true }; // FIXME: false would make more sense to me. - // Copy before sorting - // Thread local is not available on XCode version < V.8 - It will slow down computation -#ifdef GUDHI_CAN_USE_CXX11_THREAD_LOCAL - thread_local -#endif // GUDHI_CAN_USE_CXX11_THREAD_LOCAL - std::vector<Vertex_handle> copy; + thread_local std::vector<Vertex_handle> copy; copy.clear(); copy.insert(copy.end(), first, last); std::sort(copy.begin(), copy.end()); @@ -1133,10 +1128,7 @@ class Simplex_tree { Dictionary_it next = siblings->members().begin(); ++next; -#ifdef GUDHI_CAN_USE_CXX11_THREAD_LOCAL - thread_local -#endif // GUDHI_CAN_USE_CXX11_THREAD_LOCAL - std::vector<std::pair<Vertex_handle, Node> > inter; + thread_local std::vector<std::pair<Vertex_handle, Node> > inter; for (Dictionary_it s_h = siblings->members().begin(); s_h != siblings->members().end(); ++s_h, ++next) { Simplex_handle root_sh = find_vertex(s_h->first); |