Skip to content

Update and simplify some code for C++14#9071

Merged
hahnjo merged 3 commits intoroot-project:masterfrom
hahnjo:8643-cxx14
Oct 7, 2021
Merged

Update and simplify some code for C++14#9071
hahnjo merged 3 commits intoroot-project:masterfrom
hahnjo:8643-cxx14

Conversation

@hahnjo
Copy link
Copy Markdown
Member

@hahnjo hahnjo commented Oct 5, 2021

Closes #8643

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 5, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

hahnjo
hahnjo commented Oct 5, 2021
View reviewed changes
@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 5, 2021

Build failed on mac1014/python3.
Running on macphsft17.dyndns.cern.ch:/build/jenkins/workspace/root-pullrequests-build
See console output.

Warnings:

  • [2021-10-05T14:55:20.231Z] builtins/xrootd/XROOTD-prefix/include/xrootd/XrdCl/XrdClOptional.hh:58:29: warning: unused parameter 'n' [-Wunused-parameter]

pcanal
pcanal reviewed Oct 5, 2021
View reviewed changes
@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 5, 2021

Build failed on mac11.0/cxx17.
Running on macphsft23.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Warnings:

  • [2021-10-05T16:32:02.012Z] builtins/xrootd/XROOTD-prefix/include/xrootd/XrdCl/XrdClOptional.hh:58:29: warning: unused parameter 'n' [-Wunused-parameter]

Failing tests:

hahnjo added 3 commits October 7, 2021 10:14
@hahnjo
[tmva] Remove very outdated checks for C++ version
386b1bb 
ROOT now requires at least C++14.
@hahnjo
Simplify ThreadLocalStorage.h
d1a846f 
Rely on thread_local from C++11 unconditionally and remove the case
from !__cplusplus, where R__HAS_THREAD_LOCAL would never be set.
@hahnjo
Update rest of preprocessor code for C++14
acd8fc9
@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 7, 2021

Starting build on ROOT-debian10-i386/cxx14, ROOT-performance-centos8-multicore/default, ROOT-ubuntu16/nortcxxmod, mac1014/python3, mac11.0/cxx17, windows10/cxx14
How to customize builds

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 7, 2021

Build failed on mac1014/python3.
Running on macitois22.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Warnings:

  • [2021-10-07T09:39:16.154Z] builtins/xrootd/XROOTD-prefix/include/xrootd/XrdCl/XrdClOptional.hh:58:29: warning: unused parameter 'n' [-Wunused-parameter]

pcanal
pcanal reviewed Oct 7, 2021
View reviewed changes
core/thread/inc/ThreadLocalStorage.h
# define TTHREAD_TLS_PTR(name) &name

#elif defined(R__HAS_THREAD_LOCAL)
#else
Copy link
Copy Markdown
Member

@pcanal pcanal Oct 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can also remove the #ifdef __CINT__ section :)

Copy link
Copy Markdown
Member Author

@hahnjo hahnjo Oct 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's leave this for another PR ;)

@phsft-bot
Copy link
Copy Markdown

phsft-bot commented Oct 7, 2021

Build failed on mac11.0/cxx17.
Running on macphsft23.dyndns.cern.ch:/Users/sftnight/build/workspace/root-pullrequests-build
See console output.

Warnings:

  • [2021-10-07T11:38:33.073Z] builtins/xrootd/XROOTD-prefix/include/xrootd/XrdCl/XrdClOptional.hh:58:29: warning: unused parameter 'n' [-Wunused-parameter]

Failing tests:

@hahnjo hahnjo merged commit e82e2d9 into root-project:master Oct 7, 2021
@hahnjo hahnjo deleted the 8643-cxx14 branch October 7, 2021 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bellenot bellenot bellenot left review comments

@pcanal pcanal pcanal approved these changes

@Axel-Naumann Axel-Naumann Awaiting requested review from Axel-Naumann

@couet couet Awaiting requested review from couet couet is a code owner

@lmoneta lmoneta Awaiting requested review from lmoneta lmoneta is a code owner

@omazapa omazapa Awaiting requested review from omazapa

+1 more reviewer

@etejedor etejedor etejedor approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@hahnjo hahnjo

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Some parts of ROOT still mention C++11

5 participants

@hahnjo @phsft-bot @pcanal @bellenot @etejedor