Commit 40573a99 authored by Andrea Valassi's avatar Andrea Valassi Committed by cdelort
Browse files

Cleanup - Remove COOL300CPP11 (CORALCOOL-2943)

git-svn-id: https://svnweb.cern.ch/trac/lcgcool/changeset/20127 4525493e-7705-40b1-a816-d608a930855b
parent 54d3158c
......@@ -50,7 +50,7 @@
// Disable COOL 3.x API changes (COOL 2.x releases)
//---------------------------------------------------------------------------
#ifdef COOL300
#define COOL300CPP11 1 // API changes replacing Boost by c++11 std
#define COOL300CPP11 1 // KEPT BUT NO LONGER NEEDED CORALCOOL-2943
#define COOL300TS 1 // API use coral::TimeStamp in cool::Time
#define COOL300DP 1 // API remove previously deprecated calls
#else
......
......@@ -5,11 +5,7 @@
#include "CoolKernel/VersionInfo.h"
// Include files
#ifdef COOL300CPP11
#include <memory>
#else
#include <boost/shared_ptr.hpp>
#endif
#include <vector>
namespace cool
......@@ -39,7 +35,6 @@ namespace cool
class ITransaction;
#endif
#ifdef COOL300CPP11
// STD shared pointers
typedef std::shared_ptr<IDatabase> IDatabasePtr;
typedef std::shared_ptr<IFolder> IFolderPtr;
......@@ -54,22 +49,6 @@ namespace cool
#ifdef COOL400
typedef std::shared_ptr<ITransaction> ITransactionPtr;
#endif
#else
// Boost shared pointers
typedef boost::shared_ptr<IDatabase> IDatabasePtr;
typedef boost::shared_ptr<IFolder> IFolderPtr;
typedef boost::shared_ptr<IFolderSet> IFolderSetPtr;
typedef boost::shared_ptr<IObject> IObjectPtr;
typedef boost::shared_ptr<IObjectIterator> IObjectIteratorPtr;
typedef std::vector<IObjectPtr> IObjectVector;
typedef boost::shared_ptr<IObjectVector> IObjectVectorPtr;
typedef boost::shared_ptr<IRecord> IRecordPtr;
typedef std::vector<IRecordPtr> IRecordVector;
typedef boost::shared_ptr<IRecordVector> IRecordVectorPtr;
#ifdef COOL400
typedef boost::shared_ptr<ITransaction> ITransactionPtr;
#endif
#endif
}
......
......@@ -9,10 +9,9 @@
#include "RVersion.h"
// Sanity check: does ROOT support c++11 in the COOL API?
#ifdef COOL300CPP11
// NB: COOL300CPP11 is no longer necessary (CORALCOOL-2943)
#if ROOT_VERSION_CODE < ROOT_VERSION(5,99,0)
#error("ERROR: COOL300CPP11 but ROOT5 does not support c++11")
#endif
#error("ERROR: COOL300 requires CPP11 but ROOT5 does not support c++11")
#endif
// Disable deprecation warnings (bug #103338) in PyCool on ROOT6 (ROOT-5870)
......@@ -173,10 +172,6 @@ namespace dummy
std::type_info *aTypeInfo;
#ifndef COOL300CPP11
boost::detail::shared_count aSharedCount;
#endif
coral::Blob aBlob;
//coral::Date aDate;
//coral::TimeStamp aTimeStamp;
......
#ifndef CORALCONNECTIONSERVICEPROXY_H
#define CORALCONNECTIONSERVICEPROXY_H 1
// First of all, set/unset COOL290, COOL300, COOL_HAS_CPP11 and COOL400 macros
#include "CoolKernel/VersionInfo.h"
// Include files
#include <iostream>
#ifdef COOL300CPP11
#include <memory>
#else
#include <boost/shared_ptr.hpp>
#endif
#include "boost_thread_headers.h"
#include "RelationalAccess/IConnectionService.h"
......@@ -122,11 +115,7 @@ namespace cool
};
// Type definition
#ifdef COOL300CPP11
typedef std::shared_ptr<CoralConnectionServiceProxy> CoralConnectionServiceProxyPtr;
#else
typedef boost::shared_ptr<CoralConnectionServiceProxy> CoralConnectionServiceProxyPtr;
#endif
}
#endif // CORALCONNECTIONSERVICEPTR_H
......@@ -5,9 +5,6 @@
#include "CoolKernel/VersionInfo.h"
// Include files
#ifndef COOL300CPP11
#include <boost/enable_shared_from_this.hpp>
#endif
#include "RelationalAccess/ISessionProxy.h"
// Local include files
......@@ -43,7 +40,6 @@ namespace cool
*///
class RalDatabase : public RelationalDatabase
#ifdef COOL300CPP11 // Fix CORALCOOL-2810
#ifndef __APPLE__
, public std::enable_shared_from_this<RalDatabase> // TODO: use IDatabase also on linux? (CORALCOOL-2764 and CORALCOOL-2810)
#else
......@@ -52,9 +48,6 @@ namespace cool
#else
, public std::enable_shared_from_this<IDatabase> // Fix CORALCOOL-2764 on mac including clang70 (workaround for clang60 bug???)
#endif
#endif
#else
, public boost::enable_shared_from_this<RalDatabase>
#endif
{
......
#ifndef RELATIONALCOOL_RELATIONALDATABASEPTR_H
#define RELATIONALCOOL_RELATIONALDATABASEPTR_H
// First of all, set/unset CORAL290, COOL300, COOL400 and COOL_HAS_CPP11 macros
#include "CoolKernel/VersionInfo.h"
// Include files
#ifdef COOL300CPP11
#include <memory>
#else
#include <boost/shared_ptr.hpp>
#endif
namespace cool
{
......@@ -18,11 +11,7 @@ namespace cool
class RelationalDatabase;
/// Shared pointer to a RelationalObject
#ifdef COOL300CPP11 // Fix CORALCOOL-2810
typedef std::shared_ptr<RelationalDatabase> RelationalDatabasePtr;
#else
typedef boost::shared_ptr<RelationalDatabase> RelationalDatabasePtr;
#endif
}
......
#ifndef RELATIONALCOOL_RELATIONALOBJECTPTR_H
#define RELATIONALCOOL_RELATIONALOBJECTPTR_H 1
// First of all, set/unset CORAL290, COOL300, COOL400 and COOL_HAS_CPP11 macros
#include "CoolKernel/VersionInfo.h"
// Include files
#ifdef COOL300CPP11
#include <memory>
#else
#include <boost/shared_ptr.hpp>
#endif
namespace cool
{
......@@ -18,11 +11,7 @@ namespace cool
class RelationalObject;
/// Shared pointer to a RelationalObject
#ifdef COOL300CPP11
typedef std::shared_ptr<RelationalObject> RelationalObjectPtr;
#else
typedef boost::shared_ptr<RelationalObject> RelationalObjectPtr;
#endif
}
......
Supports Markdown
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