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

Fix includes/fwd decls in Fireworks/Core #19332

Merged
merged 1 commit into from Jun 20, 2017

Conversation

Teemperor
Copy link
Contributor

We have to forward declare TEveWindowSlot/TEveElement because
we reference pointers to those types in the respective headers.

We have to include Rtypes.h to get Color_t in FWDetailViewBase.h
and FWModelExpressionSelector.h. In FWViewBase.h we have to
include Rtypes.h for Int_t.

In FWDetailViewManager.h/FWInteractionList.h we have to
include because we use std::vector there.

@Teemperor
Copy link
Contributor Author

Part of the work going on regarding the C++ modules migration of CMSSW (tracked as issue #15248). This PR is not meant to refactor things, but just to make these headers compile.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Teemperor (Raphael Isemann) for master.

It involves the following packages:

Fireworks/Core

@cmsbuild, @alja, @Dr15Jones, @davidlange6 can you please review it and eventually sign? Thanks.
@alja this is something you requested to watch as well.
@davidlange6 you are the release manager for this.

cms-bot commands are listed here

We have to forward declare TEveWindowSlot/TEveElement because
we reference pointers to those types in the respective headers.

We have to include Rtypes.h to get Color_t in FWDetailViewBase.h
and FWModelExpressionSelector.h. In FWViewBase.h we have to
include Rtypes.h for Int_t.

In FWDetailViewManager.h/FWInteractionList.h we have to
include <vector> because we use std::vector there.
@davidlange6
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 19, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/20712/console Started: 2017/06/19 11:25

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison not run due to Fireworks only changes in PR (RelVals and Igprof tests were also skipped)

@davidlange6
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit bd08a19 into cms-sw:master Jun 20, 2017
@Teemperor Teemperor deleted the FixIncludesFwdDeclsFireworksCore branch December 19, 2017 08:47
@Teemperor Teemperor restored the FixIncludesFwdDeclsFireworksCore branch December 19, 2017 10:42
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

3 participants