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

Fix compilation with GCC9 and MSVC 2019 with CMAKE_CXX_STANDARD=20 #6648

Closed
wants to merge 12 commits into from
Closed

Fix compilation with GCC9 and MSVC 2019 with CMAKE_CXX_STANDARD=20 #6648

Changes from 1 commit
Commits
Show all changes
12 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
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
Fix whitespace / noeol in CMakeLists.txt
  • Loading branch information
@pdillinger
pdillinger committed Apr 10, 2020
commit 831fb29a12b0441a8b161a3218686fe519af17cf
10 changes: 5 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ if(MSVC)
else()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Gm")
endif()

endif()
if(WITH_RUNTIME_DEBUG)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /${RUNTIME_LIBRARY}d")
Expand Down Expand Up @@ -507,7 +507,7 @@ if(HAVE_AUXV_GETAUXVAL)
add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
endif()

# Workaround to get c++ std version option coming from CMAKE_CXX_STANDARD for try_compile
# Workaround to get c++ std version option coming from CMAKE_CXX_STANDARD for try_compile
include(CxxFlags)
get_cxx_std_flags(CMAKE_REQUIRED_FLAGS)

Expand All @@ -519,7 +519,7 @@ int apply(F f) {

struct test {
test() : value_(0) {}

int lambda() {
return apply([=]() {
return value_;
Expand Down Expand Up @@ -992,7 +992,7 @@ if(WITH_TESTS)
add_library(testharness STATIC
test_util/testharness.cc)
target_link_libraries(testharness gtest)

set(TESTS
cache/cache_test.cc
cache/lru_cache_test.cc
Expand Down Expand Up @@ -1269,4 +1269,4 @@ if(WITH_TOOLS)
add_subdirectory(db_stress_tool)
add_custom_target(tools
DEPENDS ${tool_deps})
endif()
endif()