Commit 20b471de authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Remove another bunch of COOL29 (CORALCOOL-2943)


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@20130 4525493e-7705-40b1-a816-d608a930855b
parent 851b8ecc
#ifndef COOLKERNEL_CHANNELSELECTION_H
#define COOLKERNEL_CHANNELSELECTION_H 1
// First of all, set/unset CORAL290, COOL400 and COOL_HAS_CPP11 macros
// First of all, set/unset COOL400 macros
#include "CoolKernel/VersionInfo.h"
// Include files
......@@ -45,13 +45,9 @@ namespace cool
public:
// Required by PyCool
#ifdef COOL290CO
ChannelRange()
: m_firstChannel( 0 ) // Fix Coverity UNINIT_CTOR (bug #95363)
, m_lastChannel( 0 ) {}
#else
ChannelRange() {}
#endif
ChannelRange( const ChannelId& firstChannel,
const ChannelId& lastChannel );
......
#ifndef COOLKERNEL_EXCEPTION_H
#define COOLKERNEL_EXCEPTION_H 1
// First of all, enable or disable the COOL290 API extensions (bug #92204)
// First of all, enable or disable the API extensions (bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
......@@ -346,21 +346,12 @@ namespace cool {
, m_parentOnly( parentOnly )
{
std::ostringstream msg;
#ifndef COOL290EX
if ( parentOnly )
msg << "Node #" << descendantNodeId
<< " is not a descendant of node #" << ancestorNodeId;
else
msg << "Node #" << descendantNodeId
<< " is not a child of node #" << ancestorNodeId;
#else
if ( parentOnly )
msg << "Node #" << descendantNodeId
<< " is not a child of node #" << ancestorNodeId;
else
msg << "Node #" << descendantNodeId
<< " is not a descendant of node #" << ancestorNodeId;
#endif
setMessage( msg.str() );
}
......@@ -879,7 +870,7 @@ namespace cool {
/** @class InvalidFolderSpecification.
*
* Exception thrown when attempting to create (a new folder using) an
* invalid folder specification (e.g. see bug #103343). Added in COOL290.
* invalid folder specification (e.g. see bug #103343).
*
* @author Andrea Valassi
* @date 2013-12-01
......@@ -916,12 +907,7 @@ namespace cool {
* @date 2007-01-08
*///
class InvalidPayloadSpecification :
#ifdef COOL290EX
public InvalidFolderSpecification
#else
public Exception
#endif
class InvalidPayloadSpecification : public InvalidFolderSpecification
{
public:
......@@ -929,11 +915,7 @@ namespace cool {
/// Constructor
explicit InvalidPayloadSpecification( const std::string& message,
const std::string& domain ) :
#ifdef COOL290EX
InvalidFolderSpecification( message, domain )
#else
Exception( message, domain )
#endif
{}
/// Destructor
......
#ifndef COOLKERNEL_IAPPLICATION_H
#define COOLKERNEL_IAPPLICATION_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/MessageLevels.h"
......@@ -68,12 +65,10 @@ namespace cool
/// *** WARNING: throws an exception for applications not using CORAL. ***
virtual coral::IConnectionService& connectionSvc() const = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IApplication& operator=( const IApplication& rhs );
#endif
};
......
#ifndef COOLKERNEL_IDATABASE_H
#define COOLKERNEL_IDATABASE_H 1
// First of all, set/unset CORAL290, COOL400 and COOL_HAS_CPP11 macros
// First of all, set/unset COOL400 macros
#include "CoolKernel/VersionInfo.h"
// Include files
......@@ -166,12 +166,10 @@ namespace cool
virtual ITransactionPtr startTransaction() = 0;
#endif
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IDatabase& operator=( const IDatabase& rhs );
#endif
};
......
#ifndef COOLKERNEL_IDATABASESVC_H
#define COOLKERNEL_IDATABASESVC_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/DatabaseId.h"
#include "CoolKernel/pointers.h"
......@@ -72,12 +69,10 @@ namespace cool
/// Retrieve the version number of the database service software.
virtual const std::string serviceVersion() const = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IDatabaseSvc& operator=( const IDatabaseSvc& rhs );
#endif
};
......
#ifndef COOLKERNEL_IFIELD_H
#define COOLKERNEL_IFIELD_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/IFieldSpecification.h"
#include "CoolKernel/RecordException.h"
......@@ -149,10 +146,8 @@ namespace cool
private:
#ifdef COOL290CO
/// Assignment operator is private (see bug #95823)
IField& operator=( const IField& rhs );
#endif
/// Compare the values of this and another field.
/// The values of two fields are equal either if they are both non null
......
#ifndef COOLKERNEL_IFIELDSPECIFICATION_H
#define COOLKERNEL_IFIELDSPECIFICATION_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/StorageType.h"
......@@ -96,12 +93,10 @@ namespace cool
virtual void validate( const coral::Attribute& attribute,
bool checkName = true ) const = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IFieldSpecification& operator=( const IFieldSpecification& rhs );
#endif
};
......
#ifndef COOLKERNEL_IFOLDERSET_H
#define COOLKERNEL_IFOLDERSET_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include <string>
#include <vector>
......@@ -45,12 +42,10 @@ namespace cool
/// (implementation-specific properties not exposed in the API).
virtual const IRecord& folderSetAttributes() const = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IFolderSet& operator=( const IField& rhs );
#endif
};
......
#ifndef COOLKERNEL_IHVSNODE_H
#define COOLKERNEL_IHVSNODE_H 1
// First of all, set/unset CORAL290, COOL400 and COOL_HAS_CPP11 macros
// First of all, enable or disable the COOL400 API extensions
#include "CoolKernel/VersionInfo.h"
// Include files
......@@ -163,12 +163,10 @@ namespace cool
virtual void setTagDescription( const std::string& tagName,
const std::string& description ) = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IHvsNode& operator=( const IHvsNode& rhs );
#endif
};
......
#ifndef COOLKERNEL_IHVSNODERECORD_H
#define COOLKERNEL_IHVSNODERECORD_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include <cctype>
#include <string>
......@@ -79,12 +76,10 @@ namespace cool
/// (implementation-specific properties not exposed in the API).
virtual const IRecord& nodeAttributes() const = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IHvsNodeRecord& operator=( const IHvsNodeRecord& rhs );
#endif
};
......
#ifndef COOLKERNEL_IOBJECTITERATOR_H
#define COOLKERNEL_IOBJECTITERATOR_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/pointers.h"
......@@ -114,12 +111,10 @@ namespace cool
/// The iterator cannot be used any more after this method is called.
virtual void close() = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IObjectIterator& operator=( const IObjectIterator& rhs );
#endif
};
......
#ifndef COOLKERNEL_IRECORD_H
#define COOLKERNEL_IRECORD_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include <sstream>
#include "CoolKernel/IField.h"
......@@ -113,10 +110,8 @@ namespace cool
private:
#ifdef COOL290CO
/// Assignment operator is private (fix bug #95823)
IRecord& operator=( const IRecord& rhs );
#endif
/// Return a field in this record by its index in [0, N-1] (const).
virtual const IField& field( UInt32 index ) const = 0;
......
#ifndef COOLKERNEL_IRECORDITERATOR_H
#define COOLKERNEL_IRECORDITERATOR_H 1
// First of all, enable or disable the COOL290 API extensions (bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/pointers.h"
......
#ifndef COOLKERNEL_IRECORDSELECTION_H
#define COOLKERNEL_IRECORDSELECTION_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/Record.h"
......@@ -63,12 +60,10 @@ namespace cool
/// Clone the record selection (and any objects referenced therein).
virtual IRecordSelection* clone() const = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IRecordSelection& operator=( const IRecordSelection& rhs );
#endif
};
......
#ifndef COOLKERNEL_IRECORDSPECIFICATION_H
#define COOLKERNEL_IRECORDSPECIFICATION_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/IFieldSpecification.h"
#include "CoolKernel/types.h"
......@@ -130,12 +127,10 @@ namespace cool
coral::AttributeListSpecification& attributeListSpecification() const = 0;
*///
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IRecordSpecification& operator=( const IRecordSpecification& rhs );
#endif
};
......
#ifndef COOLKERNEL_ITIME_H
#define COOLKERNEL_ITIME_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include <ostream>
......@@ -70,12 +67,10 @@ namespace cool
/// Comparison operator.
bool operator!=( const ITime& rhs ) const;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
ITime& operator=( const ITime& rhs );
#endif
};
......
#ifndef COOLKERNEL_ITRANSACTION_H
#define COOLKERNEL_ITRANSACTION_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
// First of all, enable or disable the COOL400 API extensions
#include "CoolKernel/VersionInfo.h"
// This class only exists in the COOL400 API
......@@ -31,12 +31,10 @@ namespace cool
/// Rollback the transaction
virtual void rollback() = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
ITransaction& operator=( const ITransaction& rhs );
#endif
};
......
// First of all, enable or disable the COOL290 API extensions (bug #92204)
// First of all, enable or disable the COOL CPP11
#include "CoolKernel/VersionInfo.h"
// Include files
......
......@@ -76,12 +76,12 @@ class TestFolderSpecification( unittest.TestCase ): # test for bug #103351
self.assertEqual( True, fspec.hasPayloadTable() )
else:
self.assertEqual( SEPARATE, fspec.payloadMode() )
# 3rd argument is 2: expect separate payload on 290,
# but expect an exception on 28x
# 3rd argument is 2: expect separate payload on 2.9,
# but expect an exception on 2.8
if VERSION < 20900:
try: fspec = cool.FolderSpecification( SV, self.rspec, 2 )
except: pass
else: self.fail( '3rd arg == 2 should throw in COOL28x' )
else: self.fail( '3rd arg == 2 should throw in COOL2.8' )
else:
fspec = cool.FolderSpecification( SV, self.rspec, 2 )
self.assertEqual( SV, fspec.versioningMode() )
......@@ -112,7 +112,7 @@ class TestFolderSpecification( unittest.TestCase ): # test for bug #103351
else:
try: fspec = cool.FolderSpecification()
except: pass
else: self.fail( 'default ctor should throw in COOL290' )
else: self.fail( 'default ctor should throw in COOL2.9' )
# ctor from versioning mode
if VERSION < 20900:
fspec = cool.FolderSpecification( SV )
......@@ -122,12 +122,12 @@ class TestFolderSpecification( unittest.TestCase ): # test for bug #103351
else:
try: fspec = cool.FolderSpecification( SV )
except: pass
else: self.fail( 'ctor from versioning mode should throw in COOL290' )
else: self.fail( 'ctor from versioning mode should throw in COOL2.9' )
# ctor from payload specification
if VERSION < 20900:
try: fspec = cool.FolderSpecification( self.rspec )
except: pass
else: self.fail( 'ctor from payload spec should throw in COOL28x' )
else: self.fail( 'ctor from payload spec should throw in COOL2.8' )
else:
fspec = cool.FolderSpecification( self.rspec )
self.assertEqual( SV, fspec.versioningMode() )
......@@ -142,7 +142,7 @@ class TestFolderSpecification( unittest.TestCase ): # test for bug #103351
else:
try: fspec = cool.FolderSpecification( 0 )
except: pass
else: self.fail( 'ctor from 1 arg == 0 should throw in COOL290' )
else: self.fail( 'ctor from 1 arg == 0 should throw in COOL2.9' )
# ctor with 1 argument == 1
if VERSION < 20900:
fspec = cool.FolderSpecification( 1 )
......@@ -152,7 +152,7 @@ class TestFolderSpecification( unittest.TestCase ): # test for bug #103351
else:
try: fspec = cool.FolderSpecification( 1 )
except: pass
else: self.fail( 'ctor from 1 arg == 1 should throw in COOL290' )
else: self.fail( 'ctor from 1 arg == 1 should throw in COOL2.9' )
# ctor with 1 argument == 2
try: fspec = cool.FolderSpecification( 2 )
except: pass
......@@ -161,7 +161,7 @@ class TestFolderSpecification( unittest.TestCase ): # test for bug #103351
try: fspec = cool.FolderSpecification( -1 )
except: pass
else: self.fail( 'ctor from 1 arg == -1 should always throw' )
# copy ctor (explicit in COOL290, default in COOL28x)
# copy ctor (explicit in COOL2.9, default in COOL2.8)
fspec = cool.FolderSpecification( SV, self.rspec )
fspec2 = cool.FolderSpecification( fspec )
self.assertEqual( SV, fspec2.versioningMode() )
......
// First of all, enable or disable the COOL290 API extensions (bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include <map>
#include <vector>
......
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