Skip to content

GitLab

Commit d9f3ab80 authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_2_0_8'

parents 6d8eb3f7 911f723e
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ d9f3ab80
......@@ -31,7 +31,13 @@ cmake_minimum_required(VERSION 2.6)
# project name
project(CLHEP)
set( VERSION 2.2.0.7 )
set( VERSION 2.2.0.8 )
# If Policy CMP0042 exists, use OLD to prefer the use of install names
# instead of the new @rpath default.
if(POLICY CMP0042)
cmake_policy(SET CMP0042 OLD)
endif()
set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules
......
Cast/configure.ac
View file @ d9f3ab80
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Cast, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Cast)
AC_INIT(CLHEP Cast, 2.2.0.8, http://savannah.cern.ch/projects/clhep/, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......
ChangeLog
View file @ d9f3ab80
==============================
12.06.15 Release CLHEP-2.2.0.8
==============================
2015-06-12 Lynn Garren <garren@fnal.gov>
* Random/Random/RandGauss.h, Random/src/RandGauss.cc:
implement static methods dealing with static data
in RandGauss.cc instead of in RandGauss.h
* protect against warnings in Utility/memory.h and Utility/type_traits.h
==============================
27.06.11 Release CLHEP-2.2.0.7
==============================
2015-06-10 Lynn Garren <garren@fnal.gov>
* do not add -Wno-deprecated-declarations when building for c++NN
* protect against warnings in Utility/memory.h
* do not use -Wno-deprecated-declarations when building for c++NN
* __attribute__((unused)) is not recognized by Visual C++
* Make sure asserts are enabled for tests by removing -DNDEBUG
from the compiler flags when building the tests. This solves
......
Evaluator/ChangeLog
View file @ d9f3ab80
==============================
12.06.15 Release CLHEP-2.2.0.8
==============================
==============================
27.05.15 Release CLHEP-2.2.0.6
==============================
==============================
......
Evaluator/configure.ac
View file @ d9f3ab80
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Evaluator, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_INIT(CLHEP Evaluator, 2.2.0.8, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......
Exceptions/ChangeLog
View file @ d9f3ab80
==============================
12.06.15 Release CLHEP-2.2.0.8
==============================
==============================
27.05.15 Release CLHEP-2.2.0.6
==============================
==============================
......
Exceptions/configure.ac
View file @ d9f3ab80
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Exceptions, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_INIT(CLHEP Exceptions, 2.2.0.8, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......
Fields/ChangeLog
View file @ d9f3ab80
==============================
12.06.15 Release CLHEP-2.2.0.8
==============================
==============================
27.05.15 Release CLHEP-2.2.0.6
==============================
==============================
......
Fields/configure.ac
View file @ d9f3ab80
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Fields, 2.2.0.7, CLHEP@cern.ch, Fields)
AC_INIT(CLHEP Fields, 2.2.0.8, CLHEP@cern.ch, Fields)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/XF.cc])
......
GenericFunctions/ChangeLog
View file @ d9f3ab80
==============================
12.06.15 Release CLHEP-2.2.0.8
==============================
==============================
27.05.15 Release CLHEP-2.2.0.6
==============================
==============================
......
GenericFunctions/configure.ac
View file @ d9f3ab80
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP GenericFunctions, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 2.2.0.8, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......
Geometry/ChangeLog
View file @ d9f3ab80
==============================
12.06.15 Release CLHEP-2.2.0.8
==============================
==============================
27.05.15 Release CLHEP-2.2.0.6
==============================
==============================
......
Geometry/configure.ac
View file @ d9f3ab80
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Geometry, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_INIT(CLHEP Geometry, 2.2.0.8, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Plane3D.cc])
......
Matrix/ChangeLog
View file @ d9f3ab80
==============================
12.06.15 Release CLHEP-2.2.0.8
==============================
==============================
27.05.15 Release CLHEP-2.2.0.6
==============================
==============================
......
Matrix/configure.ac
View file @ d9f3ab80
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Matrix, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_INIT(CLHEP Matrix, 2.2.0.8, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DiagMatrix.cc])
......
Random/ChangeLog
View file @ d9f3ab80
==============================
12.06.15 Release CLHEP-2.2.0.8
==============================
==============================
27.05.15 Release CLHEP-2.2.0.6
==============================
==============================
......
Random/Random/RandGauss.h
View file @ d9f3ab80
......@@ -110,9 +110,9 @@ public:
// code before shoot/fire will force generation of a new couple of
// values.
static bool getFlag() {return set_st;}
static bool getFlag();
static void setFlag( bool val ) {set_st = val;}
static void setFlag( bool val );
bool getF() const {return set;}
......@@ -144,9 +144,9 @@ public:
protected:
static double getVal() {return nextGauss_st;}
static double getVal();
static void setVal( double nextVal ) {nextGauss_st = nextVal;}
static void setVal( double nextVal );
double normal();
......
Random/Random/Randomize.h
View file @ d9f3ab80
......@@ -60,11 +60,10 @@
#include "CLHEP/Random/RandSkewNormal.h"
#include "CLHEP/Random/RandStudentT.h"
#if defined __GNUC__
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
#ifdef __clang__
#elif __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable"
#endif
......@@ -79,10 +78,10 @@ static const int HepRandomGenActive = HepRandom::createInstance();
} // namespace CLHEP
#if defined __GNUC__
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
#pragma GCC diagnostic pop
#endif
#ifdef __clang__
#elif __clang__
#pragma clang diagnostic pop
#endif
......
Random/configure.ac
View file @ d9f3ab80
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Random, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Random)
AC_INIT(CLHEP Random, 2.2.0.8, http://savannah.cern.ch/projects/clhep/, Random)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DRand48Engine.cc])
......
Random/src/RandGauss.cc
View file @ d9f3ab80
......@@ -58,6 +58,15 @@ double RandGauss::operator()( double mean, double stdDev ) {
return fire( mean, stdDev );
}
// implement static methods dealing with static data here
bool RandGauss::getFlag() {return set_st;}
void RandGauss::setFlag( bool val ) {set_st = val;}
double RandGauss::getVal() {return nextGauss_st;}
void RandGauss::setVal( double nextVal ) {nextGauss_st = nextVal;}
double RandGauss::shoot()
{
// Gaussian random numbers are generated two at the time, so every other
......
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