Skip to content

Commit f4b26a9

Browse files
authored
Merge pull request #4112 from dschwen/atomic_fparser_epsilon_4111
Add mutex to setEpsilon
2 parents bf44ddf + a7490b9 commit f4b26a9

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

contrib/fparser/fparser.cc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@
1717
#include "fpconfig.hh"
1818
#include "fparser.hh"
1919

20-
#include <set>
21-
#include <cstdlib>
22-
#include <cstring>
20+
#include <cassert>
2321
#include <cctype>
2422
#include <cmath>
25-
#include <cassert>
23+
#include <cstdlib>
24+
#include <cstring>
2625
#include <limits>
26+
#include <mutex>
27+
#include <set>
2728

2829
#include "extrasrc/fptypes.hh"
2930
#include "extrasrc/fpaux.hh"
@@ -931,6 +932,8 @@ Value_t FunctionParserBase<Value_t>::epsilon()
931932
template<typename Value_t>
932933
void FunctionParserBase<Value_t>::setEpsilon(Value_t value)
933934
{
935+
static std::mutex epsilon_mutex;
936+
std::lock_guard<std::mutex> lock(epsilon_mutex);
934937
Epsilon<Value_t>::value = value;
935938
}
936939

0 commit comments

Comments
 (0)