diff --git a/[refs] b/[refs] index 0f7ed0abe27f2..f42a0aa3b69d6 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": ca5e91dd2740a396949ecb5d41c029382afa1a14 +"refs/heads/CMSSW_7_1_X": 22dc9e95b3dbb28128b018ceaa67a8b0d5661d83 diff --git a/trunk/CondFormats/Calibration/src/classes_def.xml b/trunk/CondFormats/Calibration/src/classes_def.xml index 682b51747c88f..a64bcd381ee3c 100644 --- a/trunk/CondFormats/Calibration/src/classes_def.xml +++ b/trunk/CondFormats/Calibration/src/classes_def.xml @@ -59,7 +59,12 @@ - + + + + + + diff --git a/trunk/CondFormats/Common/test/runAllPayloadsTest b/trunk/CondFormats/Common/test/runAllPayloadsTest index 3ad7f2e969a29..a2560d8fd82d5 100755 --- a/trunk/CondFormats/Common/test/runAllPayloadsTest +++ b/trunk/CondFormats/Common/test/runAllPayloadsTest @@ -12,7 +12,7 @@ cp $CMSSW_BASE/src/CondFormats/Common/test/testPayloadIO.cc . set pack=$CMSSW_BASE/src/CondFormats/$1 echo "testing package $pack" -foreach class (grep "class_version" $pack/src/classes_def.xml | sed 's/[^"]*"//' | sed 's/".*//') +foreach class (`grep "class_version" $pack/src/classes_def.xml | sed 's/[^"]*"//' | sed 's/".*//'`) set cname=`echo "$class" | sed 's/[<,:, ,>]/_/g'` echo "#define ALLCLASSES" > ${cname}_test.cc cat testPayloadIO.cc >> ${cname}_test.cc diff --git a/trunk/CondFormats/Common/test/testPayloadIO.cc b/trunk/CondFormats/Common/test/testPayloadIO.cc index 3737aac1381c0..12cc2694f4cc6 100644 --- a/trunk/CondFormats/Common/test/testPayloadIO.cc +++ b/trunk/CondFormats/Common/test/testPayloadIO.cc @@ -22,7 +22,7 @@ #ifdef ALLCLASSES -#include "CondFormats/THEPACKAGE/src/classes.h +#include "CondFormats/THEPACKAGE/src/classes.h" #else #include "CondFormats/THEPACKAGE/interface/THEHEADER.h" #endif