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.

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

C++20 compatibility #6697

Closed
wants to merge 21 commits into from
Closed

C++20 compatibility #6697

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
af91b57
Fix implicit capture of ‘this’ via ‘[=]’ is deprecated in C++20
syoliver-se Mar 22, 2020
880549c
Allow to choose C++ version in cmake command line
syoliver-se Mar 22, 2020
4a1df6e
Fix deprecated copy warning in gcc 9
syoliver-se Apr 5, 2020
2756589
Minimal Rebuild is deprecated in visual studio since 2015 and is forb…
syoliver-se Apr 5, 2020
cea96d0
random_shuffle is deprecated in C++14 and removed in C++17
syoliver-se Apr 5, 2020
4e46260
Fix implicit this lambda capture deprecation
syoliver-se Apr 5, 2020
96f7359
Add implicit lambda capture in raw makefile
syoliver-se Apr 6, 2020
5962870
Add MSVC2019 to AppVeyor
syoliver-se Apr 6, 2020
d31e395
Add gcc-9 with c++11 and c++20 to travis
syoliver-se Apr 6, 2020
43eee91
Merge remote-tracking branch 'origin/master' into pr/6648
pdillinger Apr 10, 2020
87f3151
Reduce cmake variants built on each PR
pdillinger Apr 10, 2020
831fb29
Fix whitespace / noeol in CMakeLists.txt
pdillinger Apr 10, 2020
3de7ca9
Tweak so that no configuration change is needed
pdillinger Apr 10, 2020
c9e951e
Unified RandomShuffle
pdillinger Apr 13, 2020
756ea7f
Remove 'this' capture from folly import
pdillinger Apr 14, 2020
1b7b028
Remove an unnecessary capture spec
pdillinger Apr 14, 2020
dda5107
make format
pdillinger Apr 14, 2020
427a33d
Merge remote-tracking branch 'origin/master' into cxx20
pdillinger Apr 14, 2020
882a9d5
Fixup after merge
pdillinger Apr 14, 2020
c19c8ac
Better capture solution for Baton.h
pdillinger Apr 14, 2020
da5b61e
Actually, just use explicit capture
pdillinger Apr 14, 2020
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
12 changes: 4 additions & 8 deletions third-party/folly/folly/synchronization/Baton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
#include <folly/synchronization/WaitOptions.h>
#include <folly/synchronization/detail/Spin.h>

#ifdef ROCKSDB_EXPLICIT_CAPTURE_THIS
#define ROCKSDB_THIS_LAMBDA_CAPTURE =, this
#else
#define ROCKSDB_THIS_LAMBDA_CAPTURE =
#endif

namespace folly {

/// A Baton allows a thread to block once and be awoken. Captures a
Expand Down Expand Up @@ -256,7 +250,9 @@ class Baton {
const std::chrono::time_point<Clock, Duration>& deadline,
const WaitOptions& opt) noexcept {

switch (detail::spin_pause_until(deadline, opt, [ROCKSDB_THIS_LAMBDA_CAPTURE] { return ready(); })) {
// Avoid implicit/explicit capture 'this' because C++ standards change
const auto thiz = this;
switch (detail::spin_pause_until(deadline, opt, [thiz] { return thiz->ready(); })) {
Copy link

Choose a reason for hiding this comment

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

[this] { return ready(); should be enough, no ?

Copy link
Contributor Author

@pdillinger pdillinger Apr 14, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

You're right. Unlike [=,this], [this] should be standard (C++11 and on). Got my wires crossed

Copy link

Choose a reason for hiding this comment

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

@pdillinger Me too... maybe removing all implicit captures can just fix the issue without ugly preprocessor define. I wanted to give a try before tomorrow but I saw your PR :)

case detail::spin_result::success:
return true;
case detail::spin_result::timeout:
Expand All @@ -266,7 +262,7 @@ class Baton {
}

if (!MayBlock) {
switch (detail::spin_yield_until(deadline, [ROCKSDB_THIS_LAMBDA_CAPTURE] { return ready(); })) {
switch (detail::spin_yield_until(deadline, [thiz] { return thiz->ready(); })) {
case detail::spin_result::success:
return true;
case detail::spin_result::timeout:
Expand Down