mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-19 00:08:32 +01:00
dbd0f3e957
Not strictly an upgrade, but adds a new mongodb-4_2 target with the current mongodb from that branch. Use matching client and server versions in mongodb tests- tests were using the mongo 3.4 client to connect, and this finally doesn't work with server 4.2. Per reviewer suggestion, adding myself as cheetah3 maintainer. Additionally, reestore comments describing the purpose of the build-dependencies patch
22 lines
No EOL
1 KiB
Diff
22 lines
No EOL
1 KiB
Diff
--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp
|
|
+++ b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
|
|
@@ -831,20 +831,8 @@
|
|
# endif // (__cplusplus >= 201402)
|
|
# endif // (_LIBCPP_VERSION < 7000)
|
|
# else // defined(ASIO_HAS_CLANG_LIBCXX)
|
|
-# if (__cplusplus >= 201402)
|
|
-# if __has_include(<experimental/string_view>)
|
|
-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
|
|
-# endif // __has_include(<experimental/string_view>)
|
|
-# endif // (__cplusplus >= 201402)
|
|
# endif // // defined(ASIO_HAS_CLANG_LIBCXX)
|
|
# endif // defined(__clang__)
|
|
-# if defined(__GNUC__)
|
|
-# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
|
-# if (__cplusplus >= 201402)
|
|
-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
|
|
-# endif // (__cplusplus >= 201402)
|
|
-# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
|
|
-# endif // defined(__GNUC__)
|
|
# endif // !defined(ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
|
|
#endif // !defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
|