Commit 6d8eb3f7 authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_2_0_7'

parents 3c4a5291 6f18b95e
......@@ -31,7 +31,7 @@ cmake_minimum_required(VERSION 2.6)
# project name
project(CLHEP)
set( VERSION 2.2.0.6 )
set( VERSION 2.2.0.7 )
set(CMAKE_MODULE_PATH
${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Cast, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, Cast)
AC_INIT(CLHEP Cast, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Cast)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/itos.cc])
......
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
* __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
the unused variable problem.
==============================
27.05.15 Release CLHEP-2.2.0.6
==============================
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Evaluator, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_INIT(CLHEP Evaluator, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Evaluator)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Evaluator.cc])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Exceptions, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_INIT(CLHEP Exceptions, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Exceptions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMerrno.cc])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.57)
AC_INIT(CLHEP Fields, 2.2.0.6, CLHEP@cern.ch, Fields)
AC_INIT(CLHEP Fields, 2.2.0.7, CLHEP@cern.ch, Fields)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/XF.cc])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP GenericFunctions, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_INIT(CLHEP GenericFunctions, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, GenericFunctions)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Abs.cc])
......
clhep_enable_asserts()
clhep_test( testGenericFunctions )
......@@ -3,21 +3,10 @@
#include "CLHEP/GenericFunctions/Cos.hh"
#include "CLHEP/GenericFunctions/defs.h"
#include <float.h>
#include <assert.h>
#include <cassert>
#include <cmath>
// don't generate warnings about unused variables inside assert
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
#endif
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-variable"
#endif
int main(int, char **) {
using namespace Genfun;
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Geometry, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_INIT(CLHEP Geometry, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Geometry)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/Plane3D.cc])
......
remove_definitions(-DNDEBUG)
clhep_enable_asserts()
clhep_test( testBasicVector3D )
clhep_test( testBug6740 SIMPLE )
......@@ -38,7 +38,7 @@ using namespace HepGeom;
\
/* Check conversion to array */ \
const point p05(1,2,3); \
const type * a __attribute__((unused)) = p05; \
const type * a = p05; \
assert(a[0] == 1 && a[1] == 2 && a[2] == 3); \
point p06(4,5,6); \
a = p06; \
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Matrix, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_INIT(CLHEP Matrix, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Matrix)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DiagMatrix.cc])
......
......@@ -61,14 +61,8 @@
#include "CLHEP/Random/RandStudentT.h"
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
#if __GNUC__ > 4
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
#endif
#ifdef __clang__
#pragma clang diagnostic push
......@@ -86,12 +80,7 @@ static const int HepRandomGenActive = HepRandom::createInstance();
} // namespace CLHEP
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic pop
#endif
#if __GNUC__ > 4
#pragma GCC diagnostic pop
#endif
#endif
#ifdef __clang__
#pragma clang diagnostic pop
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Random, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, Random)
AC_INIT(CLHEP Random, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Random)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/DRand48Engine.cc])
......
remove_definitions(-DNDEBUG)
clhep_enable_asserts()
set( Random_tests testRandom
testRandDists )
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP RandomObjects, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, RandomObjects)
AC_INIT(CLHEP RandomObjects, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, RandomObjects)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/RandMultiGauss.cc])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP RefCount, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, RefCount)
AC_INIT(CLHEP RefCount, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, RefCount)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/ZMuseCount.cc])
......
......@@ -9,7 +9,7 @@
# ----------------------------------------------------------------------
AC_PREREQ(2.59)
AC_INIT(CLHEP Units, 2.2.0.6, http://savannah.cern.ch/projects/clhep/, Units)
AC_INIT(CLHEP Units, 2.2.0.7, http://savannah.cern.ch/projects/clhep/, Units)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 foreign)
......
......@@ -32,18 +32,14 @@
// don't generate unnecessary warnings
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
#endif
#if __GNUC__ > 4
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
#endif
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdelete-non-virtual-dtor"
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
#include "CLHEP/Utility/defs.h"
......@@ -1491,12 +1487,7 @@ do_nothing_deleter::operator () ( void const * ) const
#if defined __GNUC__
#if __GNUC__ > 3 && __GNUC_MINOR__ > 6
#pragma GCC diagnostic pop
#endif
#if __GNUC__ > 4
#pragma GCC diagnostic pop
#endif
#endif
#ifdef __clang__
#pragma clang diagnostic pop
......
Markdown is supported
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