Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge from V6_main 15/03/2013
[tools/medcoupling.git]
/
src
/
MEDCoupling
/
MEDCouplingTimeLabel.hxx
diff --git
a/src/MEDCoupling/MEDCouplingTimeLabel.hxx
b/src/MEDCoupling/MEDCouplingTimeLabel.hxx
index 4755d2edd88d3432c8f898554b538082f54ec81d..a6498f5c779b3b1df59750395f5fe681710098f1 100644
(file)
--- a/
src/MEDCoupling/MEDCouplingTimeLabel.hxx
+++ b/
src/MEDCoupling/MEDCouplingTimeLabel.hxx
@@
-42,6
+42,7
@@
namespace ParaMEDMEM
TimeLabel();
virtual ~TimeLabel();
void updateTimeWith(const TimeLabel& other) const;
+ void forceTimeOfThis(const TimeLabel& other) const;
private:
static unsigned int GLOBAL_TIME;
mutable unsigned int _time;