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.

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

Remove dependency on XDAQ from HcalOnlineDb #804

Merged
merged 1 commit into from Sep 12, 2013

Conversation

ktf
Copy link
Contributor

@ktf ktf commented Sep 12, 2013

A compatibility library has been added called xdaq_compat. It includes a
typedef for replacing log4cplus, and copies the toString function from
toolbox.

Most of the changes introduced in this patch are revertible at compile
time by passing the definition "HAVE_XDAQ" to the compiler.

A summary of the changes follows:

  • log4cplus/logger has been replaced with an ostream

  • toolbox::toString has been copied into xdaq_compat.h

  • xgi/Utils.h was unused and so removed

  • Fix inheritance problem from std::exception

    std::exception defines virtual ~Exception() throw(), whereas the
    hcal::exception::Exception was trying to overwrite this with virtual ~Exception {}. This lead to a "looser throw specifier" error. As the
    derived class has no reason to redefine this method, it had been
    removed.

This is a forward port of #737.

A compatibility library has been added called xdaq_compat. It includes a
typedef for replacing log4cplus, and copies the toString function from
toolbox.

Most of the changes introduced in this patch are revertible at compile
time by passing the definition "HAVE_XDAQ" to the compiler.

A summary of the changes follows:

* log4cplus/logger has been replaced with an ostream

* toolbox::toString has been copied into xdaq_compat.h

* xgi/Utils.h was unused and so removed

* Fix inheritance problem from std::exception

  std::exception defines `virtual ~Exception() throw()`, whereas the
  hcal::exception::Exception was trying to overwrite this with `virtual
  ~Exception {}`. This lead to a "looser throw specifier" error. As the
  derived class has no reason to redefine this method, it had been
  removed.

This is a forward port of cms-sw#737.
@cmsbuild
Copy link
Contributor

A new Pull Request was created by @ktf (Giulio Eulisse) for CMSSW_7_0_X.

Remove dependency on XDAQ from HcalOnlineDb

It involves the following packages:

CaloOnlineTools/HcalOnlineDb

@ggovi, @apfeiffer1 can you please review it and eventually sign? Thanks.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.

@ktf
Copy link
Contributor Author

ktf commented Sep 12, 2013

Notice this is a showstopper for pre4.

@nclopezo
Copy link
Contributor

Hi,

I ran the usual tests on top of CMSSW_7_0_X_2013-09-12-0200, all tests passed:

https://cmssdt.cern.ch/jenkins/job/Pull-Request-Integration/ARCHITECTURE=slc5_amd64_gcc481/470/console

@apfeiffer1
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next IBs unless changes or unless it breaks tests.

ktf added a commit that referenced this pull request Sep 12, 2013
Remove dependency on XDAQ from HcalOnlineDb
@ktf ktf merged commit fddecbb into cms-sw:CMSSW_7_0_X Sep 12, 2013
@ktf ktf deleted the remove-xdaq-HcalOnlineDb branch September 12, 2013 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants