Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 1 | From e5f72c656829402c6f70e7416039bc18f0c26485 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 30 Aug 2022 22:17:14 -0700 |
| 4 | Subject: [PATCH] Do not use std::shuffle with clang 15 |
| 5 | |
| 6 | This fails to compile although its preferred approach for c++11 and |
| 7 | newer |
| 8 | |
| 9 | See |
| 10 | https://github.com/SOCI/soci/issues/984 |
| 11 | |
| 12 | Upstream-Status: Inappropriate [Workaround] |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | cmake/SociConfig.cmake | 1 + |
| 16 | 1 file changed, 1 insertion(+) |
| 17 | |
| 18 | diff --git a/cmake/SociConfig.cmake b/cmake/SociConfig.cmake |
| 19 | index 492e1837..f24fd9a6 100644 |
| 20 | --- a/cmake/SociConfig.cmake |
| 21 | +++ b/cmake/SociConfig.cmake |
| 22 | @@ -94,6 +94,7 @@ else() |
| 23 | set(SOCI_CXX11 ON) |
| 24 | set(SOCI_CXX_VERSION_FLAGS "-std=c++11") |
| 25 | add_definitions(-DCATCH_CONFIG_CPP11_NO_IS_ENUM) |
| 26 | + add_definitions(-DCATCH_CONFIG_CPP11_NO_SHUFFLE) |
| 27 | |
| 28 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SOCI_GCC_CLANG_COMMON_FLAGS} ${SOCI_CXX_VERSION_FLAGS}") |
| 29 | |
| 30 | -- |
| 31 | 2.37.3 |
| 32 | |