Commit f7d27369 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Enable payload queries in COOL260 (remove #ifdef COOL270).


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@14934 4525493e-7705-40b1-a816-d608a930855b
parent b3894f32
// $Id: CompositeSelection.h,v 1.4 2008-08-27 10:41:55 avalassi Exp $
// $Id: CompositeSelection.h,v 1.5 2008-11-03 16:52:36 avalassi Exp $
#ifndef COOLKERNEL_COMPOSITESELECTION_H
#define COOLKERNEL_COMPOSITESELECTION_H 1
#ifdef COOL270
// Include files
#include <vector>
......@@ -98,5 +97,4 @@ namespace cool
};
}
#endif
#endif // COOLKERNEL_COMPOSITESELECTION_H
// $Id: FieldSelection.h,v 1.12 2008-08-27 10:41:55 avalassi Exp $
// $Id: FieldSelection.h,v 1.13 2008-11-03 16:52:36 avalassi Exp $
#ifndef COOLKERNEL_FIELDSELECTION_H
#define COOLKERNEL_FIELDSELECTION_H 1
#ifdef COOL270
// Include files
#include "CoolKernel/FieldSpecification.h"
......@@ -122,5 +121,4 @@ namespace cool
//---------------------------------------------------------------------------
}
#endif
#endif // COOLKERNEL_FIELDSELECTION_H
// $Id: IFolder.h,v 1.123 2008-10-28 18:30:52 avalassi Exp $
// $Id: IFolder.h,v 1.124 2008-11-03 16:52:36 avalassi Exp $
#ifndef COOLKERNEL_IFOLDER_H
#define COOLKERNEL_IFOLDER_H
......@@ -178,11 +178,8 @@ namespace cool {
browseObjects( const ValidityKey& since,
const ValidityKey& until,
const ChannelSelection& channels,
const std::string& tagName = ""
#ifdef COOL270
, const IRecordSelection* payloadQuery = 0
#endif
) const = 0;
const std::string& tagName = "",
const IRecordSelection* payloadQuery = 0 ) const = 0;
/// Count the number of objects that would be returned by the
/// browseObjects method for the same selection parameters.
......@@ -198,11 +195,8 @@ namespace cool {
countObjects( const ValidityKey& since,
const ValidityKey& until,
const ChannelSelection& channels,
const std::string& tagName = ""
#ifdef COOL270
, const IRecordSelection* payloadQuery = 0
#endif
) const = 0;
const std::string& tagName = "",
const IRecordSelection* payloadQuery = 0 ) const = 0;
/// Change the object prefetch policy (default is prefetchAll=true).
/// If prefetchAll is true, the browse() methods prefetch all IOVs and
......
// $Id: IRecordSelection.h,v 1.9 2008-08-27 10:41:56 avalassi Exp $
// $Id: IRecordSelection.h,v 1.10 2008-11-03 16:52:36 avalassi Exp $
#ifndef COOLKERNEL_IRECORDSELECTION_H
#define COOLKERNEL_IRECORDSELECTION_H 1
......@@ -8,8 +8,6 @@
namespace cool
{
#ifdef COOL270
//--------------------------------------------------------------------------
/** @class IRecordSelection IRecordSelection.h
......@@ -64,12 +62,5 @@ namespace cool
};
#else
/// Forward declaration
class IRecordSelection;
#endif
}
#endif // COOLKERNEL_IRECORDSELECTION_H
// $Id: RecordSelectionException.h,v 1.2 2008-08-27 10:41:56 avalassi Exp $
// $Id: RecordSelectionException.h,v 1.3 2008-11-03 16:52:36 avalassi Exp $
#ifndef COOLKERNEL_RECORDSELECTIONEXCEPTION_H
#define COOLKERNEL_RECORDSELECTIONEXCEPTION_H 1
......@@ -6,9 +6,8 @@
#include <sstream>
#include "CoolKernel/Exception.h"
namespace cool {
#ifdef COOL270
namespace cool
{
//--------------------------------------------------------------------------
......@@ -37,8 +36,6 @@ namespace cool {
//--------------------------------------------------------------------------
#endif
}
#endif // COOLKERNEL_RECORDSELECTIONEXCEPTION_H
// $Id: CompositeSelection.cpp,v 1.6 2008-08-27 10:41:56 avalassi Exp $
#ifdef COOL270
// $Id: CompositeSelection.cpp,v 1.7 2008-11-03 16:55:01 avalassi Exp $
// Include files
#include <sstream>
......@@ -190,4 +189,3 @@ CompositeSelection::operator[] ( const unsigned int index ) const
//-----------------------------------------------------------------------------
#endif
// $Id: FieldSelection.cpp,v 1.14 2008-08-27 10:41:56 avalassi Exp $
#ifdef COOL270
// $Id: FieldSelection.cpp,v 1.15 2008-11-03 16:55:01 avalassi Exp $
// Include files
//#include <iostream>
......@@ -336,4 +335,3 @@ const IField& FieldSelection::referenceValue() const
//-----------------------------------------------------------------------------
#endif
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