Merge branch 'origin/V7_main'

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

diff --git a/src/MEDCoupling/MEDCouplingTimeLabel.cxx b/src/MEDCoupling/MEDCouplingTimeLabel.cxx
index 9c2716c1e70ad62d83900490e8ec9ddcc4d121c3..a827585315fc5807508bf7a1f89a9846b5139db8 100644 (file)
--- a/src/MEDCoupling/MEDCouplingTimeLabel.cxx
+++ b/src/MEDCoupling/MEDCouplingTimeLabel.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,7 +22,7 @@
 
 using namespace ParaMEDMEM;
 
-unsigned int TimeLabel::GLOBAL_TIME=0;
+std::size_t TimeLabel::GLOBAL_TIME=0;
 
 TimeLabel::TimeLabel():_time(GLOBAL_TIME++)
 {
@@ -48,3 +48,12 @@ void TimeLabel::updateTimeWith(const TimeLabel& other) const
   if(_time<other._time)
     _time=other._time;
 }
+
+/*!
+ * This method has to be called with a lot of care. It set agressively the time in this with the
+ * time in \a other.
+ */
+void TimeLabel::forceTimeOfThis(const TimeLabel& other) const
+{
+  _time=other._time;
+}