Skip to content

C++17 fixes #591

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.

Sign up for GitHub

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

Closed
davidlt wants to merge 7 commits into from
Closed

C++17 fixes #591

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b490f2e
Fix check for std::apply (R__HAS_STD_APPLY)
davidlt May 26, 2017
f692ada
Set __cplusplus to 201703L for C++1z (C++17)
davidlt May 26, 2017
35469f4
Don't provide std::__ROOT::apply if R__HAS_STD_APPLY is defined
davidlt May 26, 2017
da6e821
Add missing <functional> header
davidlt May 26, 2017
9fc549c
Fix std::string_view usage if compiled in C++17 mode
davidlt May 26, 2017
be8dddd
Apply git clang-format suggested changes
davidlt May 26, 2017
0276049
Provide null-terminated C strings
davidlt May 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't provide std::__ROOT::apply if R__HAS_STD_APPLY is defined 
std::apply is part of C++17. Thus if we are compiling ROOT6 with
GCC 7.1.1 in C++17 mode we don't need std::__ROOT::apply otherwise
it would generate ambiguity errors.

Signed-off-by: David Abdurachmanov <[email protected]>
  • Loading branch information
@davidlt
davidlt committed May 26, 2017
commit 35469f4c58714b0790cca752e615dfc96ec7a339
2 changes: 2 additions & 0 deletions core/base/v7/inc/ROOT/impl_tuple_apply.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ decltype(auto) invoke(F&& f, ArgTypes&&... args) {
}
#endif // ndef R__HAS_STD_INVOKE

#ifndef R__HAS_STD_APPLY
// From http://en.cppreference.com/w/cpp/experimental/apply
namespace detail {
template<class F, class Tuple, std::size_t... I>
Expand All @@ -82,6 +83,7 @@ constexpr decltype(auto) apply(F &&f, Tuple &&t) {
std::make_index_sequence < std::tuple_size <
std::decay_t < Tuple >> {} > {});
}
#endif // ndef R__HAS_STD_APPLY
} // namespace __ROOT
} // namespace std

Expand Down