Commit 1b36acdf authored by Micha Müller's avatar Micha Müller
Browse files

Delete outdated patches

parent b7f193a3
This diff is collapsed.
--- a/CMakeLists.txt 2015-02-06 14:55:56.437712699 +0100
+++ b/CMakeLists.txt 2015-02-06 14:56:45.850837955 +0100
@@ -297,16 +297,7 @@
install(FILES ${INC_FILES} DESTINATION "${INSTALL_HEADERS_DIR}")
endif()
-# Where to put libraries - either lib or lib64.
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-if("${LIB64}" STREQUAL "TRUE" AND "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- set(LIBSUFFIX 64)
-else()
- set(LIBSUFFIX "")
-endif()
-
-set(INSTALL_LIB_DIR "lib${LIBSUFFIX}")
+set(INSTALL_LIB_DIR "lib")
# For windows only
set(INSTALL_DLL_DIR "bin")
diff -u cpp-driver-2.0.1.orig/CMakeLists.txt cpp-driver-2.0.1/CMakeLists.txt
--- cpp-driver-2.0.1.orig/CMakeLists.txt 2015-11-04 20:21:16.000000000 +0100
+++ cpp-driver-2.0.1/CMakeLists.txt 2015-11-04 20:21:48.000000000 +0100
@@ -420,7 +420,7 @@
elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# Clang/Intel specific compiler options
# I disabled long-long warning because boost generates about 50 such warnings
- set(WARNING_COMPILER_FLAGS "-Wall -pedantic -Wextra -Wno-long-long -Wno-unused-parameter -Wno-variadic-macros -Wno-zero-length-array")
+ set(WARNING_COMPILER_FLAGS "-Wall -pedantic -Wextra -Wno-long-long -Wno-unused-parameter -Wno-variadic-macros -Wno-zero-length-array -Wno-unused-local-typedef")
# OpenSSL is deprecated on later versions of Mac OS X. The long-term solution
# is to provide a CommonCryto implementation.
diff -ur cpp-netlib-0.12.0-final/boost/network/protocol/http/server/async_connection.hpp cpp-netlib-0.12.0-final.patched/boost/network/protocol/http/server/async_connection.hpp
--- cpp-netlib-0.12.0-final/boost/network/protocol/http/server/async_connection.hpp 2016-03-30 13:38:49.000000000 +0200
+++ cpp-netlib-0.12.0-final.patched/boost/network/protocol/http/server/async_connection.hpp 2018-09-05 09:35:15.000000000 +0200
@@ -378,7 +378,7 @@
boost::throw_exception(std::system_error(*error_encountered));
if (new_start != read_buffer_.begin()) {
input_range input =
- boost::make_iterator_range(new_start, read_buffer_.end());
+ boost::make_iterator_range(new_start, data_end);
buffer_type::iterator start_tmp = new_start;
new_start = read_buffer_.begin();
auto self = this->shared_from_this();
@@ -389,11 +389,12 @@
}
auto self = this->shared_from_this();
- socket().async_read_some(asio::buffer(read_buffer_),
- strand.wrap([this, self, callback](
- std::error_code ec, size_t bytes_transferred) {
- callback(ec, bytes_transferred);
- }));
+ socket().async_read_some(
+ asio::buffer(read_buffer_),
+ strand.wrap([this, self, callback](std::error_code ec,
+ size_t bytes_transferred) {
+ this->wrap_read_handler(callback, ec, bytes_transferred);
+ }));
}
/// Returns a reference to the underlying socket.
--- cpp-netlib-0.9.4.orig/CMakeLists.txt 2012-04-20 19:37:42.000000000 +0200
+++ cpp-netlib-0.9.4/CMakeLists.txt 2016-08-09 10:01:06.261095338 +0200
@@ -7,7 +7,7 @@
project(CPP-NETLIB)
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTI_THREADED ON)
-find_package( Boost 1.45.0 REQUIRED unit_test_framework system regex date_time thread filesystem program_options )
+find_package( Boost 1.45.0 REQUIRED system regex date_time thread filesystem program_options )
find_package( OpenSSL )
find_package( Threads )
set(CMAKE_VERBOSE_MAKEFILE true)
@@ -30,11 +30,6 @@
include_directories(${Boost_INCLUDE_DIRS})
enable_testing()
add_subdirectory(libs/network/src)
- add_subdirectory(libs/network/test)
- if (NOT MSVC)
- add_subdirectory(libs/mime/test)
- endif(NOT MSVC)
- add_subdirectory(libs/network/example)
endif(Boost_FOUND)
enable_testing()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment