Commit 00050fce authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'develop' into CLHEP_2_200_branch

parents 65e2e758 38e56041
2014-05-04 Lynn Garren <garren@fnal.gov>
* Random/src/Random.cc: remove unnecessary inline
============================== ==============================
12.05.14 Release CLHEP-2.1.4.2 12.05.14 Release CLHEP-2.1.4.2
============================== ==============================
......
2014-05-13 Lynn Garren <garren@fnal.gov>
* src/Random.cc: remove unnecessary inline
2014-03-04 W. David Dagenhart <wdd@fnal.gov> 2014-03-04 W. David Dagenhart <wdd@fnal.gov>
* In Random package convert statics and globals to const, thread * In Random package convert statics and globals to const, thread
local or atomic to improve thread safety. local or atomic to improve thread safety.
============================== ==============================
12.05.14 Release CLHEP-2.1.4.2 12.05.14 Release CLHEP-2.1.4.2
============================== ==============================
......
...@@ -62,7 +62,6 @@ struct defaults { ...@@ -62,7 +62,6 @@ struct defaults {
shared_ptr<HepRandomEngine> theEngine; shared_ptr<HepRandomEngine> theEngine;
}; // defaults }; // defaults
inline
defaults & theDefaults() { defaults & theDefaults() {
static CLHEP_THREAD_LOCAL HepRandom theDefaultGenerator; static CLHEP_THREAD_LOCAL HepRandom theDefaultGenerator;
static CLHEP_THREAD_LOCAL HepJamesRandom theDefaultEngine; static CLHEP_THREAD_LOCAL HepJamesRandom theDefaultEngine;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment