Skip to content

Commit 90a1b0b

Browse files
deanberrisdeanberris
committed
Merge branch 'master' into http-server-rewrite
Conflicts: concurrency/src/CMakeLists.txt concurrency/test/CMakeLists.txt http/src/CMakeLists.txt http/test/CMakeLists.txt http/test/server_async_less_copy.cpp http/test/server_async_run_stop_concurrency.cpp http/test/server_include_inlined.cpp logging/src/CMakeLists.txt message/src/CMakeLists.txt message/test/CMakeLists.txt
2 parents e772881 + 5a369fc commit 90a1b0b

File tree

20 files changed

+272
-64
lines changed

20 files changed

+272
-64
lines changed

‎CMakeLists.txt

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 2.8)
88
project(CPP-NETLIB)
99

1010
option( CPP-NETLIB_BUILD_SHARED_LIBS "Build cpp-netlib as shared libraries." OFF )
11+
option( CPP-NETLIB_BUILD_SINGLE_LIB "Build cpp-netlib into a single library" OFF )
1112
option( CPP-NETLIB_BUILD_TESTS "Build the unit tests." ON )
1213
option( CPP-NETLIB_BUILD_EXAMPLES "Build the examples using cpp-netlib." ON )
1314
option( CPP-NETLIB_ALWAYS_LOGGING "Allow cpp-netlib to log debug messages even in non-debug mode." OFF )
@@ -18,10 +19,14 @@ option( CPP-NETLIB_DISABLE_LIBCXX "Disable using libc++ when compiling with clan
1819
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
1920
find_package( ICU )
2021

21-
if(CPP-NETLIB_BUILD_SHARED_LIBS)
22+
if(CPP-NETLIB_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
2223
set(Boost_USE_STATIC_LIBS OFF)
24+
set(CPP-NETLIB_BUILD_SHARED_LIBS ON)
25+
set(BUILD_SHARED_LIBS ON)
2326
else()
2427
set(Boost_USE_STATIC_LIBS ON)
28+
set(CPP-NETLIB_BUILD_SHARED_LIBS OFF)
29+
set(BUILD_SHARED_LIBS OFF)
2530
endif()
2631
set(Boost_USE_MULTITHREADED ON)
2732
set(Boost_COMPONENTS system regex date_time filesystem program_options )
@@ -82,6 +87,7 @@ endif(Boost_FOUND)
8287

8388
message(STATUS "CPP-NETLIB options selected:")
8489
message(STATUS " CPP-NETLIB_BUILD_SHARED_LIBS: ${CPP-NETLIB_BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")
90+
message(STATUS " CPP-NETLIB_BUILD_SINGLE_LIB: ${CPP-NETLIB_BUILD_SINGLE_LIB}\t(Build cpp-netlib into a single library: OFF, ON)")
8591
message(STATUS " CPP-NETLIB_BUILD_TESTS: ${CPP-NETLIB_BUILD_TESTS}\t(Build the unit tests: ON, OFF)")
8692
message(STATUS " CPP-NETLIB_BUILD_EXAMPLES: ${CPP-NETLIB_BUILD_EXAMPLES}\t(Build the examples using cpp-netlib: ON, OFF)")
8793
message(STATUS " CPP-NETLIB_ALWAYS_LOGGING: ${CPP-NETLIB_ALWAYS_LOGGING}\t(Allow cpp-netlib to log debug messages even in non-debug mode: ON, OFF)")
@@ -122,6 +128,16 @@ if(CPP-NETLIB_BUILD_TESTS)
122128
set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARIES} ${GMOCK_MAIN_LIBRARIES})
123129
endif()
124130

131+
if(CPP-NETLIB_BUILD_SINGLE_LIB)
132+
include_directories(
133+
${CMAKE_CURRENT_SOURCE_DIR}/concurrency/src
134+
${CMAKE_CURRENT_SOURCE_DIR}/http/src
135+
${CMAKE_CURRENT_SOURCE_DIR}/logging/src
136+
${CMAKE_CURRENT_SOURCE_DIR}/message/src
137+
${CMAKE_CURRENT_SOURCE_DIR}/uri/src
138+
)
139+
endif()
140+
125141
add_subdirectory(uri)
126142
add_subdirectory(message)
127143
add_subdirectory(logging)
@@ -131,3 +147,20 @@ add_subdirectory(http)
131147
if(CPP-NETLIB_BUILD_EXAMPLES)
132148
add_subdirectory(contrib/http_examples)
133149
endif()
150+
151+
if(CPP-NETLIB_BUILD_SINGLE_LIB)
152+
add_library(cppnetlib
153+
${Uri_SRCS}
154+
${CPP-NETLIB_MESSAGE_SRCS}
155+
${CPP-NETLIB_MESSAGE_DIRECTIVES_SRCS}
156+
${CPP-NETLIB_MESSAGE_WRAPPERS_SRCS}
157+
${CPP-NETLIB_LOGGING_SRCS}
158+
${CPP-NETLIB_HTTP_CLIENT_SRCS}
159+
${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS}
160+
${CPP-NETLIB_HTTP_MESSAGE_SRCS}
161+
${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS}
162+
${CPP-NETLIB_CONSTANTS_SRCS}
163+
${CPP-NETLIB_CONCURRENCY_SRCS}
164+
)
165+
target_link_libraries(cppnetlib ${Boost_LIBRARIES})
166+
endif()

‎concurrency/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ if(CPP-NETLIB_BUILD_TESTS)
99
enable_testing()
1010
add_subdirectory(test)
1111
endif(CPP-NETLIB_BUILD_TESTS)
12+
13+
# propagate sources to parent directory for one-lib-build
14+
set(CPP-NETLIB_CONCURRENCY_SRCS ${CPP-NETLIB_CONCURRENCY_SRCS} PARENT_SCOPE)

‎concurrency/src/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,10 @@
55

66
include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src)
77

8-
set(CPP-NETLIB_CONCURRENCY_SRCS thread_pool.cpp)
9-
add_library(cppnetlib-concurrency ${CPP-NETLIB_CONCURRENCY_SRCS})
8+
set(CPP-NETLIB_CONCURRENCY_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/thread_pool.cpp)
9+
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
10+
add_library(cppnetlib-concurrency ${CPP-NETLIB_CONCURRENCY_SRCS})
11+
endif()
12+
13+
# propagate sources to parent directory for one-lib-build
14+
set(CPP-NETLIB_CONCURRENCY_SRCS ${CPP-NETLIB_CONCURRENCY_SRCS} PARENT_SCOPE)

‎concurrency/test/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,16 @@ include_directories(${CPP-NETLIB_SOURCE_DIR}/concurrency/src
88
${CPP-NETLIB_SOURCE_DIR}
99
)
1010

11+
if(CPP-NETLIB_BUILD_SINGLE_LIB)
12+
set(link_cppnetlib_lib cppnetlib)
13+
else()
14+
set(link_cppnetlib_lib cppnetlib-concurrency)
15+
endif()
16+
1117
if (CPP-NETLIB_BUILD_TESTS)
1218
add_executable(cpp-netlib-thread_pool_test thread_pool_test.cpp)
1319
target_link_libraries(cpp-netlib-thread_pool_test
14-
cppnetlib-concurrency
20+
${link_cppnetlib_lib}
1521
${Boost_LIBRARIES}
1622
${GTEST_BOTH_LIBRARIES}
1723
${CMAKE_THREAD_LIBS_INIT})

‎concurrency/test/thread_pool_test.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
#include <gtest/gtest.h>
1010
#include <network/concurrency/thread_pool.hpp>
11-
#include <boost/bind.hpp>
11+
// #include <boost/bind.hpp>
12+
#include <functional>
1213

1314
using network::concurrency::thread_pool;
1415

@@ -37,8 +38,8 @@ TEST(concurrency_test, post_work) {
3738
foo instance;
3839
{
3940
thread_pool pool;
40-
ASSERT_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 1)));
41-
ASSERT_NO_THROW(pool.post(boost::bind(&foo::bar, &instance, 2)));
41+
ASSERT_NO_THROW(pool.post(std::bind(&foo::bar, &instance, 1)));
42+
ASSERT_NO_THROW(pool.post(std::bind(&foo::bar, &instance, 2)));
4243
// require that pool is destroyed here, RAII baby
4344
}
4445
ASSERT_EQ(instance.val(), 3);

‎contrib/http_examples/CMakeLists.txt

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ set(BOOST_SERVER_LIBS
4040
${Boost_PROGRAM_OPTIONS_LIBRARY}
4141
)
4242

43-
target_link_libraries(simple_wget
44-
${BOOST_CLIENT_LIBS}
45-
${CMAKE_THREAD_LIBS_INIT}
43+
if(CPP-NETLIB_BUILD_SINGLE_LIB)
44+
set(simple_wget_linklibs cppnetlib)
45+
else()
46+
set(simple_wget_linklibs
4647
cppnetlib-uri
4748
cppnetlib-message
4849
cppnetlib-message-directives
@@ -53,10 +54,16 @@ target_link_libraries(simple_wget
5354
cppnetlib-http-client
5455
cppnetlib-http-client-connections
5556
${CPP-NETLIB_LOGGING_LIB})
56-
57-
target_link_libraries(atom_reader
57+
endif()
58+
target_link_libraries(simple_wget
5859
${BOOST_CLIENT_LIBS}
5960
${CMAKE_THREAD_LIBS_INIT}
61+
${simple_wget_linklibs})
62+
63+
if(CPP-NETLIB_BUILD_SINGLE_LIB)
64+
set(atom_reader_linklibs cppnetlib)
65+
else()
66+
set(atom_reader_linklibs
6067
cppnetlib-uri
6168
cppnetlib-message
6269
cppnetlib-message-directives
@@ -67,10 +74,16 @@ target_link_libraries(atom_reader
6774
cppnetlib-http-client
6875
cppnetlib-http-client-connections
6976
${CPP-NETLIB_LOGGING_LIB})
70-
71-
target_link_libraries(rss_reader
77+
endif()
78+
target_link_libraries(atom_reader
7279
${BOOST_CLIENT_LIBS}
7380
${CMAKE_THREAD_LIBS_INIT}
81+
${atom_reader_linklibs})
82+
83+
if(CPP-NETLIB_BUILD_SINGLE_LIB)
84+
set(rss_reader_linklibs cppnetlib)
85+
else()
86+
set(rss_reader_linklibs
7487
cppnetlib-uri
7588
cppnetlib-message
7689
cppnetlib-message-directives
@@ -80,6 +93,11 @@ target_link_libraries(rss_reader
8093
cppnetlib-http-client
8194
cppnetlib-http-client-connections
8295
${CPP-NETLIB_LOGGING_LIB})
96+
endif()
97+
target_link_libraries(rss_reader
98+
${BOOST_CLIENT_LIBS}
99+
${CMAKE_THREAD_LIBS_INIT}
100+
${rss_reader_linklibs})
83101

84102
#target_link_libraries(twitter_search
85103
# ${BOOST_CLIENT_LIBS}
@@ -102,9 +120,10 @@ target_link_libraries(rss_reader
102120
# cppnetlib-http-server
103121
# ${CPP-NETLIB_LOGGING_LIB})
104122

105-
target_link_libraries(hello_world_client
106-
${BOOST_CLIENT_LIBS}
107-
${CMAKE_THREAD_LIBS_INIT}
123+
if(CPP-NETLIB_BUILD_SINGLE_LIB)
124+
set(hello_world_client_linklibs cppnetlib)
125+
else()
126+
set(hello_world_client_linklibs
108127
cppnetlib-uri
109128
cppnetlib-message
110129
cppnetlib-message-directives
@@ -115,6 +134,11 @@ target_link_libraries(hello_world_client
115134
cppnetlib-http-client
116135
cppnetlib-http-client-connections
117136
${CPP-NETLIB_LOGGING_LIB})
137+
endif()
138+
target_link_libraries(hello_world_client
139+
${BOOST_CLIENT_LIBS}
140+
${CMAKE_THREAD_LIBS_INIT}
141+
${hello_world_client_linklibs})
118142

119143
if (OPENSSL_FOUND)
120144
target_link_libraries(simple_wget ${OPENSSL_LIBRARIES})

‎contrib/http_examples/http/fileserver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ struct file_cache {
101101

102102
};
103103

104-
struct connection_handler : boost::enable_shared_from_this<connection_handler> {
104+
struct connection_handler : std::enable_shared_from_this<connection_handler> {
105105
explicit connection_handler(file_cache& cache) : file_cache_(cache) {}
106106

107107
void operator()(std::string const& path,
@@ -143,7 +143,7 @@ struct connection_handler : boost::enable_shared_from_this<connection_handler> {
143143
connection->write(boost::asio::const_buffers_1(
144144
static_cast<char const*>(mmaped_region.first) + offset,
145145
rightmost_bound),
146-
boost::bind(&connection_handler::handle_chunk,
146+
std::bind(&connection_handler::handle_chunk,
147147
connection_handler::shared_from_this(),
148148
mmaped_region,
149149
rightmost_bound,

‎http/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,10 @@ if(CPP-NETLIB_BUILD_TESTS)
99
enable_testing()
1010
add_subdirectory(test)
1111
endif(CPP-NETLIB_BUILD_TESTS)
12+
13+
# propagate sources to parent directory for one-lib-build
14+
set(CPP-NETLIB_HTTP_MESSAGE_SRCS ${CPP-NETLIB_HTTP_MESSAGE_SRCS} PARENT_SCOPE)
15+
set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS} PARENT_SCOPE)
16+
set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS} PARENT_SCOPE)
17+
set(CPP-NETLIB_HTTP_CLIENT_SRCS ${CPP-NETLIB_HTTP_CLIENT_SRCS} PARENT_SCOPE)
18+
set(CPP-NETLIB_CONSTANTS_SRCS ${CPP-NETLIB_CONSTANTS_SRCS} PARENT_SCOPE)

‎http/src/CMakeLists.txt

Lines changed: 101 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,23 @@ if (OPENSSL_FOUND)
1818
include_directories(${OPENSSL_INCLUDE_DIR})
1919
endif()
2020

21-
set(CPP-NETLIB_HTTP_MESSAGE_SRCS http/request.cpp http/response.cpp)
22-
add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
23-
add_dependencies(cppnetlib-http-message
24-
# ${Boost_LIBRARIES}
25-
cppnetlib-message)
26-
target_link_libraries(cppnetlib-http-message
27-
${Boost_LIBRARIES}
28-
cppnetlib-message)
21+
set(CPP-NETLIB_HTTP_MESSAGE_SRCS
22+
${CMAKE_CURRENT_SOURCE_DIR}/http/request.cpp
23+
${CMAKE_CURRENT_SOURCE_DIR}/http/response.cpp)
24+
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
25+
add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
26+
add_dependencies(cppnetlib-http-message
27+
# ${Boost_LIBRARIES}
28+
cppnetlib-message)
29+
target_link_libraries(cppnetlib-http-message
30+
${Boost_LIBRARIES}
31+
cppnetlib-message)
32+
endif()
2933

30-
set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS http/message/wrappers.cpp)
31-
add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
34+
set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/http/message/wrappers.cpp)
35+
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
36+
add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
37+
endif()
3238

3339
#set(CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS server_request_parsers_impl.cpp)
3440
#add_library(cppnetlib-http-server-parsers ${CPP-NETLIB_HTTP_SERVER_PARSERS_SRCS})
@@ -85,6 +91,7 @@ add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_S
8591
#endforeach(src_file)
8692

8793
set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
94+
<<<<<<< HEAD
8895
http/client_connections.cpp
8996
http/simple_connection_manager.cpp
9097
http/simple_connection_factory.cpp
@@ -132,3 +139,87 @@ set(CPP-NETLIB_HTTP_SERVER_SRCS
132139
http/server/session.cpp http/server/simple_sessions.cpp
133140
http/server/dynamic_dispatcher.cpp)
134141
add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
142+
=======
143+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connections.cpp
144+
${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_manager.cpp
145+
${CMAKE_CURRENT_SOURCE_DIR}/http/simple_connection_factory.cpp
146+
${CMAKE_CURRENT_SOURCE_DIR}/http/connection_delegate_factory.cpp
147+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate.cpp
148+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_resolver_delegate_factory.cpp
149+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_delegates.cpp
150+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_factory.cpp
151+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_async_resolver.cpp
152+
${CMAKE_CURRENT_SOURCE_DIR}/http/client_connection_normal.cpp)
153+
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
154+
add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
155+
endif()
156+
foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
157+
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
158+
set_source_files_properties(${src_file}
159+
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
160+
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
161+
set_source_files_properties(${src_file}
162+
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
163+
endif()
164+
endforeach(src_file)
165+
166+
set(CPP-NETLIB_HTTP_CLIENT_SRCS
167+
${CMAKE_CURRENT_SOURCE_DIR}/http/client.cpp)
168+
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
169+
add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})
170+
add_dependencies(cppnetlib-http-client
171+
${CPP-NETLIB_LOGGING_LIB}
172+
cppnetlib-constants
173+
cppnetlib-uri
174+
cppnetlib-message
175+
cppnetlib-message-wrappers
176+
cppnetlib-message-directives
177+
cppnetlib-http-message
178+
cppnetlib-http-message-wrappers
179+
cppnetlib-http-client-connections
180+
)
181+
target_link_libraries(cppnetlib-http-client
182+
${Boost_LIBRARIES}
183+
${CPP-NETLIB_LOGGING_LIB}
184+
cppnetlib-constants
185+
cppnetlib-uri
186+
cppnetlib-message
187+
cppnetlib-message-wrappers
188+
cppnetlib-message-directives
189+
cppnetlib-http-message
190+
cppnetlib-http-message-wrappers
191+
cppnetlib-http-client-connections
192+
)
193+
endif()
194+
foreach (src_file ${CPP-NETLIB_HTTP_CLIENT_SRCS})
195+
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
196+
set_source_files_properties(${src_file}
197+
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
198+
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
199+
set_source_files_properties(${src_file}
200+
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
201+
endif()
202+
endforeach(src_file)
203+
204+
set(CPP-NETLIB_CONSTANTS_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/constants.cpp)
205+
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
206+
add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
207+
endif()
208+
foreach (src_file ${CPP-NETLIB_CONSTANTS_SRCS})
209+
if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
210+
set_source_files_properties(${src_file}
211+
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
212+
elseif (${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
213+
set_source_files_properties(${src_file}
214+
PROPERTIES COMPILE_FLAGS ${CPP-NETLIB_CXXFLAGS})
215+
endif()
216+
endforeach(src_file)
217+
218+
219+
# propagate sources to parent directory for one-lib-build
220+
set(CPP-NETLIB_HTTP_MESSAGE_SRCS ${CPP-NETLIB_HTTP_MESSAGE_SRCS} PARENT_SCOPE)
221+
set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS} PARENT_SCOPE)
222+
set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS} PARENT_SCOPE)
223+
set(CPP-NETLIB_HTTP_CLIENT_SRCS ${CPP-NETLIB_HTTP_CLIENT_SRCS} PARENT_SCOPE)
224+
set(CPP-NETLIB_CONSTANTS_SRCS ${CPP-NETLIB_CONSTANTS_SRCS} PARENT_SCOPE)
225+
>>>>>>> master

‎http/src/network/protocol/http/policies/async_connection.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <boost/shared_ptr.hpp>
1414
#include <boost/lexical_cast.hpp>
1515
#include <boost/cstdint.hpp>
16-
#include <boost/enable_shared_from_this.hpp>
16+
// #include <boost/enable_shared_from_this.hpp>
1717
#include <boost/tuple/tuple.hpp>
1818
#include <functional>
1919
#include <functional>
@@ -47,7 +47,7 @@ struct simple_async_connection_manager : connection_manager {
4747
struct http_1_1_async_connection;
4848

4949
struct http_1_1_async_connection_manager : connection_manager,
50-
enable_shared_from_this<http_1_1_async_connection_manager> {
50+
std::enable_shared_from_this<http_1_1_async_connection_manager> {
5151
http_1_1_async_connection_manager(bool cache_resolved,
5252
bool follow_redirects,
5353
optional<std::string> openssl_certificate,

0 commit comments

Comments
 (0)