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

Backport Fireworks fixes from 7x to 5_3_X #6093

Merged
merged 6 commits into from Nov 18, 2014

Conversation

alja
Copy link
Contributor

@alja alja commented Oct 29, 2014

  • Workaround for crash using remote ssh via XQuartz 2.7.7
  • fix crash when save configuration when file path is invalid

@alja
Copy link
Contributor Author

alja commented Oct 29, 2014

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_5_3_X IBs unless changes or unless it breaks tests. This pull request requires discussion in the ORP meeting before it's merged. @smuzaffar, @ktf, @davidlange6, @smuzaffar

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_5_3_X IBs unless changes (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @smuzaffar, @ktf, @davidlange6, @smuzaffar

@davidlange6
Copy link
Contributor

+1

@smuzaffar
Copy link
Contributor

@alja, this does not work on slc5 where we have gcc462 compiler. We get following compilation errors, can you please fix this for 53X as soon as possible.

Fireworks/Core/src/FWConfigurationManager.cc:245:76: error: expected ';' at end of member declaration
Fireworks/Core/src/FWConfigurationManager.cc:245:78: error: 'override' does not name a type
Fireworks/Core/src/FWConfigurationManager.cc:284:50: error: expected ';' at end of member declaration
Fireworks/Core/src/FWConfigurationManager.cc:284:52: error: 'override' does not name a type
Fireworks/Core/src/FWConfigurationManager.cc:315:45: error: expected ';' at end of member declaration
Fireworks/Core/src/FWConfigurationManager.cc:315:47: error: 'override' does not name a type

@smuzaffar
Copy link
Contributor

also for Fireworks/FWInterface/src/FWFFHelper.cc
I think just dropping the override keyword should be enough

@alja
Copy link
Contributor Author

alja commented Nov 20, 2014

@smuzaffar

I have removed override statement and checked build on slc5_amd64_gcc462.
The change is in the same branch alja:53-backport .

Should I make a new PR?

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

5 participants