Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/medcoupling

[tools/medcoupling.git] / src / MEDCoupling / MEDCouplingTimeLabel.cxx

diff --git a/src/MEDCoupling/MEDCouplingTimeLabel.cxx b/src/MEDCoupling/MEDCouplingTimeLabel.cxx
index 4bb3671f788a79bf01e14145eea221ee64056d9d..9933e4d946a958746bebae1a95f5bd4b1c772f6f 100644 (file)
--- a/src/MEDCoupling/MEDCouplingTimeLabel.cxx
+++ b/src/MEDCoupling/MEDCouplingTimeLabel.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -24,9 +24,9 @@
 
 #include <limits>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
-std::size_t TimeLabel::GLOBAL_TIME=0;
+std::atomic<std::size_t> TimeLabel::GLOBAL_TIME(0);
 
 TimeLabel::TimeLabel():_time(GLOBAL_TIME++)
 {
@@ -54,7 +54,7 @@ void TimeLabel::updateTimeWith(const TimeLabel& other) const
 }
 
 /*!
- * This method has to be called with a lot of care. It set agressively the time in this with the
+ * This method has to be called with a lot of care. It set aggressively the time in this with the
  * time in \a other.
  */
 void TimeLabel::forceTimeOfThis(const TimeLabel& other) const