From 22407accf404ccb6ef15131d8e646ed290225015 Mon Sep 17 00:00:00 2001 From: Purva-Chaudhari Date: Tue, 24 Aug 2021 11:41:31 +0200 Subject: [PATCH] fixes --- CondCore/Utilities/src/CondDBFetch.cc.rej | 13 ------------- CondCore/Utilities/src/PayloadInspector.cc | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 CondCore/Utilities/src/CondDBFetch.cc.rej diff --git a/CondCore/Utilities/src/CondDBFetch.cc.rej b/CondCore/Utilities/src/CondDBFetch.cc.rej deleted file mode 100644 index 2528fb80fbcf6..0000000000000 --- a/CondCore/Utilities/src/CondDBFetch.cc.rej +++ /dev/null @@ -1,13 +0,0 @@ ---- CondCore/Utilities/src/CondDBFetch.cc -+++ CondCore/Utilities/src/CondDBFetch.cc -@@ -344,9 +344,7 @@ - std::string payloadTypeName; - bool found = session.fetchPayloadData(payloadId, payloadTypeName, data, streamerInfo); - if (!found) -- throwException( -- "Payload with id " + payloadId + " has not been found in the database.", -- "fetch"); -+ throwException("Payload with id " + payloadId + " has not been found in the database.", "fetch"); - return fetchOne(payloadTypeName, data, streamerInfo, payloadPtr); - } - diff --git a/CondCore/Utilities/src/PayloadInspector.cc b/CondCore/Utilities/src/PayloadInspector.cc index cb08ecd10b5cd..e6987122d4a12 100644 --- a/CondCore/Utilities/src/PayloadInspector.cc +++ b/CondCore/Utilities/src/PayloadInspector.cc @@ -75,7 +75,7 @@ namespace cond { std::vector > tags; tags.resize(nt); for (size_t i = 0; i < nt; i++) { - boost::python::tuple entry = tagsWithTimeBoundaries[i].cast(); + py::tuple entry = tagsWithTimeBoundaries[i].cast(); std::string tagName = entry[0].cast(); std::string time0s = entry[1].cast(); std::string time1s = entry[2].cast();