File tree Expand file tree Collapse file tree 3 files changed +35
-4
lines changed
recipes/cassandra-cpp-driver/all/patches Expand file tree Collapse file tree 3 files changed +35
-4
lines changed Original file line number Diff line number Diff line change 1
1
diff --git a/src/atomic/atomic_std.hpp b/src/atomic/atomic_std.hpp
2
- index 2ad0103..f977bf9 100644
2
+ index 2ad0103..08418a9 100644
3
3
--- a/src/atomic/atomic_std.hpp
4
4
+++ b/src/atomic/atomic_std.hpp
5
- @@ -22,12 +22,12 @@
5
+ @@ -18,16 +18,17 @@
6
+ #define DATASTAX_INTERNAL_ATOMIC_STD_HPP
7
+
8
+ #include <atomic>
9
+ + #include <type_traits>
10
+
6
11
namespace datastax { namespace internal {
7
-
12
+
8
13
enum MemoryOrder {
9
14
- MEMORY_ORDER_RELAXED = std::memory_order_relaxed,
10
15
- MEMORY_ORDER_CONSUME = std::memory_order_consume,
@@ -19,5 +24,5 @@ index 2ad0103..f977bf9 100644
19
24
+ MEMORY_ORDER_ACQ_REL = static_cast<std::underlying_type<std::memory_order>::type>(std::memory_order_acq_rel),
20
25
+ MEMORY_ORDER_SEQ_CST = static_cast<std::underlying_type<std::memory_order>::type>(std::memory_order_seq_cst)
21
26
};
22
-
27
+
23
28
template <class T>
Original file line number Diff line number Diff line change
1
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+ index c615094..b10d9c9 100644
3
+ --- a/CMakeLists.txt
4
+ +++ b/CMakeLists.txt
5
+ @@ -164,7 +164,7 @@ endif()
6
+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
7
+ "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
8
+ # Enable C++11 support to use std::atomic
9
+ - if(CASS_USE_STD_ATOMIC)
10
+ + if(1)
11
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
12
+ endif()
13
+
1
14
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
2
15
index 9052472..3f65adb 100644
3
16
--- a/cmake/Dependencies.cmake
Original file line number Diff line number Diff line change
1
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+ index c615094..b10d9c9 100644
3
+ --- a/CMakeLists.txt
4
+ +++ b/CMakeLists.txt
5
+ @@ -164,7 +164,7 @@ endif()
6
+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
7
+ "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
8
+ # Enable C++11 support to use std::atomic
9
+ - if(CASS_USE_STD_ATOMIC)
10
+ + if(1)
11
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
12
+ endif()
13
+
1
14
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
2
15
index 9052472..4701133 100644
3
16
--- a/cmake/Dependencies.cmake
You can’t perform that action at this time.
0 commit comments