diff --git a/[refs] b/[refs] index 77d5116b678da..8044d9836e67b 100644 --- a/[refs] +++ b/[refs] @@ -1,3 +1,3 @@ --- refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e -"refs/heads/CMSSW_7_1_X": b9a2b52ee25c3850b9d8c20ed8135db2cc5f93be +"refs/heads/CMSSW_7_1_X": 367c4a49ee344b50eda4d7260bf15f247a3d7ef3 diff --git a/trunk/CondFormats/Calibration/interface/Conf.h b/trunk/CondFormats/Calibration/interface/Conf.h index 0ebdf3fb13ae5..f84e724c94d27 100644 --- a/trunk/CondFormats/Calibration/interface/Conf.h +++ b/trunk/CondFormats/Calibration/interface/Conf.h @@ -10,14 +10,14 @@ namespace condex { struct ConfI : public cond::BaseKeyed { - ConfI() : v(0), key('\0') {} + ConfI() : v(0), key(' ') {} ConfI(std::string k, int i) : v(i), key(k) {} int v; std::string key; // just for test }; struct ConfF : public cond::BaseKeyed { - ConfF() : v(0), key('\0') {} + ConfF() : v(0), key(' ') {} ConfF(std::string k, float i) : v(i), key(k) {} float v; std::string key; // just for test