diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2020-02-07 18:02:58 +0100 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2020-02-07 18:02:58 +0100 |
| commit | 1aafa5f62e1def8ab5ee9cffd4995107a371d053 (patch) | |
| tree | 58f1e8b95d34a047504cc88afe6c72ad7b741070 /src/Tangential_complex/include/gudhi/Tangential_complex.h | |
| parent | 80b922bb6a4e951f8e9f0502bf8e248baee86732 (diff) | |
| parent | 81816dae256a9f3c0653b1d21443c3c32da7a974 (diff) | |
Merge branch 'dfsg/latest' into debian/sid
Diffstat (limited to 'src/Tangential_complex/include/gudhi/Tangential_complex.h')
| -rw-r--r-- | src/Tangential_complex/include/gudhi/Tangential_complex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Tangential_complex/include/gudhi/Tangential_complex.h b/src/Tangential_complex/include/gudhi/Tangential_complex.h index f058fa9f..f007bdd5 100644 --- a/src/Tangential_complex/include/gudhi/Tangential_complex.h +++ b/src/Tangential_complex/include/gudhi/Tangential_complex.h @@ -60,7 +60,7 @@ #ifdef GUDHI_USE_TBB #include <tbb/parallel_for.h> #include <tbb/combinable.h> -#include <tbb/mutex.h> +#include <mutex> #endif // #define GUDHI_TC_EXPORT_NORMALS // Only for 3D surfaces (k=2, d=3) @@ -147,7 +147,7 @@ class Tangential_complex { typedef typename Tr_traits::Vector_d Tr_vector; #if defined(GUDHI_USE_TBB) - typedef tbb::mutex Mutex_for_perturb; + typedef std::mutex Mutex_for_perturb; typedef Vector Translation_for_perturb; typedef std::vector<Atomic_wrapper<FT> > Weights; #else |