diff options
| author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-02-05 07:43:52 +0100 |
|---|---|---|
| committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-02-05 07:43:52 +0100 |
| commit | 8e888b8be306c32c561396ca80b47a0aa9f9f859 (patch) | |
| tree | c745eca4eeeeeac45551e80e3732b78e42759c7c /src/Tangential_complex | |
| parent | bf4b4eeda9762ed9e99c2b24f19331fa0111fcfe (diff) | |
| parent | 33540d9b4c4d320ee1482d876a10200d89ff4f49 (diff) | |
Merge last master modification and fix merge conflict
Diffstat (limited to 'src/Tangential_complex')
| -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 |