Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return unique_ptr from fetchPayload #25364

Merged
merged 1 commit into from Dec 7, 2018
Merged

Return unique_ptr from fetchPayload #25364

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions CondCore/CondDB/interface/Session.h
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@ namespace cond {
template <typename T> cond::Hash storePayload( const T& payload,
const boost::posix_time::ptime& creationTime = boost::posix_time::microsec_clock::universal_time() );

template <typename T> std::shared_ptr<T> fetchPayload( const cond::Hash& payloadHash );
template <typename T> std::unique_ptr<T> fetchPayload( const cond::Hash& payloadHash );

cond::Hash storePayloadData( const std::string& payloadObjectType,
const std::pair<Binary,Binary>& payloadAndStreamerInfoData,
Expand Down Expand Up @@ -212,14 +212,14 @@ namespace cond {
return ret;
}

template <typename T> inline std::shared_ptr<T> Session::fetchPayload( const cond::Hash& payloadHash ){
template <typename T> inline std::unique_ptr<T> Session::fetchPayload( const cond::Hash& payloadHash ){
cond::Binary payloadData;
cond::Binary streamerInfoData;
std::string payloadType;
if(! fetchPayloadData( payloadHash, payloadType, payloadData, streamerInfoData ) )
throwException( "Payload with id "+payloadHash+" has not been found in the database.",
"Session::fetchPayload" );
std::shared_ptr<T> ret;
std::unique_ptr<T> ret;
try{
ret = deserialize<T>( payloadType, payloadData, streamerInfoData );
} catch ( const cond::persistency::Exception& e ){
Expand Down