Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite032932

Browse files
author
Dean Michael Berris
committed
Merging in changes from the master branch.
2 parents382d80f +5953b8c commite032932

File tree

5 files changed

+29
-32
lines changed

5 files changed

+29
-32
lines changed

‎boost/network/message.hpp‎

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,15 @@
66
#ifndef __NETWORK_MESSAGE_HPP__
77
#define__NETWORK_MESSAGE_HPP__
88

9-
#include<map>
10-
#include<string>
11-
12-
13-
// include message declaration
149
#include"boost/network/message_fwd.hpp"
15-
16-
// include traits implementation
1710
#include<boost/network/traits/string.hpp>
1811
#include<boost/network/traits/ostringstream.hpp>
1912
#include<boost/network/traits/headers_container.hpp>
20-
21-
// include directives base
2213
#include<boost/network/detail/directive_base.hpp>
23-
24-
// include wrappers base
2514
#include<boost/network/detail/wrapper_base.hpp>
15+
#include<boost/network/message/directives.hpp>
16+
#include<boost/network/message/wrappers.hpp>
17+
#include<boost/network/message/transformers.hpp>
2618

2719
#include<boost/network/message/modifiers/add_header.hpp>
2820
#include<boost/network/message/modifiers/remove_header.hpp>
@@ -153,14 +145,5 @@ BOOST_CONCEPT_ASSERT((Message<basic_message<boost::network::tags::default_wstrin
153145
}// namespace network
154146
}// namespace boost
155147

156-
#include<boost/network/message/directives.hpp>
157-
// pull in directives header file
158-
159-
#include<boost/network/message/wrappers.hpp>
160-
// pull in wrappers header file
161-
162-
#include<boost/network/message/transformers.hpp>
163-
// pull in transformer header file
164-
165148
#endif// __NETWORK_MESSAGE_HPP__
166149

‎boost/network/protocol/http/impl/sync_connection_base.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ namespace boost { namespace network { namespace http { namespace impl {
197197
response_ <<network::body(body_stream.str());
198198
}
199199

200-
201200
};
202201

203202
template<classTag,unsigned version_major,unsigned version_minor>

‎boost/network/protocol/http/server.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#include<boost/shared_ptr.hpp>
1414
#include<boost/bind.hpp>
1515
#include<boost/asio/ip/tcp.hpp>
16+
#include<boost/network/protocol/http/request.hpp>
17+
#include<boost/network/protocol/http/response.hpp>
1618
#include<boost/network/protocol/http/connection.hpp>
1719
#include<boost/network/traits/string.hpp>
1820

‎boost/network/uri/basic_uri.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ namespace boost { namespace network { namespace uri {
104104
template<classTag>
105105
structbasic_uri : uri_base<Tag> {
106106
using uri_base<Tag>::operator=;
107-
using uri_base<Tag>::string_type;
107+
usingtypenameuri_base<Tag>::string_type;
108108
using uri_base<Tag>::operator==;
109109
using uri_base<Tag>::operator!=;
110110
basic_uri() : uri_base<Tag>() {}

‎libs/network/test/CMakeLists.txt‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
include_directories(${CPP-NETLIB_SOURCE_DIR})
77
find_package( Boost 1.41.0 COMPONENTS unit_test_frameworksystemregex date_time thread filesystem )
88
find_package( OpenSSL )
9-
include_directories(${OPENSSL_INCLUDE_DIR})
9+
if (OPENSSL_FOUND)
10+
include_directories(${OPENSSL_INCLUDE_DIR}})
11+
endif()
1012
find_package( Threads )
1113
set(Boost_USE_STATIC_LIBSON)
1214
set(Boost_USE_MULTITHREADEDON)
@@ -21,15 +23,26 @@ if (Boost_FOUND)
2123
add_executable(cpp-netlib-http_message_test http_message_test.cpp)
2224
add_executable(cpp-netlib-message_transform_test message_transform_test.cpp)
2325
add_executable(cpp-netlib-url_test url_test.cpp)
24-
target_link_libraries(cpp-netlib-hello_world${Boost_SYSTEM_LIBRARY}${Boost_REGEX_LIBRARY}${Boost_DATE_TIME_LIBRARY}${Boost_THREAD_LIBRARY}${CMAKE_THREAD_LIBS_INIT}${OPENSSL_LIBRARIES} )
25-
target_link_libraries(cpp-netlib-http_1_0_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
26-
target_link_libraries(cpp-netlib-http_1_1_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
27-
target_link_libraries(cpp-netlib-http_message_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES})
28-
target_link_libraries(cpp-netlib-message_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES})
29-
target_link_libraries(cpp-netlib-message_transform_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES})
30-
target_link_libraries(cpp-netlib-http_localhost_tests${Boost_LIBRARIES}${OPENSSL_LIBRARIES})
31-
target_link_libraries(cpp-netlib-https_localhost_tests${Boost_LIBRARIES}${OPENSSL_LIBRARIES})
32-
target_link_libraries(cpp-netlib-url_test${Boost_LIBRARIES}${OPENSSL_LIBRARIES})
26+
target_link_libraries(cpp-netlib-hello_world${Boost_SYSTEM_LIBRARY}${Boost_REGEX_LIBRARY}${Boost_DATE_TIME_LIBRARY}${Boost_THREAD_LIBRARY}${CMAKE_THREAD_LIBS_INIT})
27+
target_link_libraries(cpp-netlib-http_1_0_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
28+
target_link_libraries(cpp-netlib-http_1_1_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
29+
target_link_libraries(cpp-netlib-http_message_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
30+
target_link_libraries(cpp-netlib-message_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
31+
target_link_libraries(cpp-netlib-message_transform_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
32+
target_link_libraries(cpp-netlib-http_localhost_tests${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
33+
target_link_libraries(cpp-netlib-https_localhost_tests${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
34+
target_link_libraries(cpp-netlib-url_test${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT})
35+
if (OPENSSL_FOUND)
36+
target_link_libraries(cpp-netlib-hello_world${OPENSSL_LIBRARIES})
37+
target_link_libraries(cpp-netlib-http_1_0_test${OPENSSL_LIBRARIES})
38+
target_link_libraries(cpp-netlib-http_1_1_test${OPENSSL_LIBRARIES})
39+
target_link_libraries(cpp-netlib-http_message_test${OPENSSL_LIBRARIES} )
40+
target_link_libraries(cpp-netlib-message_test${OPENSSL_LIBRARIES} )
41+
target_link_libraries(cpp-netlib-message_transform_test${OPENSSL_LIBRARIES} )
42+
target_link_libraries(cpp-netlib-http_localhost_tests${OPENSSL_LIBRARIES} )
43+
target_link_libraries(cpp-netlib-https_localhost_tests${OPENSSL_LIBRARIES} )
44+
target_link_libraries(cpp-netlib-url_test${OPENSSL_LIBRARIES} )
45+
endif()
3346
set_target_properties(cpp-netlib-hello_world cpp-netlib-http_1_0_test cpp-netlib-http_1_1_test cpp-netlib-message_test cpp-netlib-http_message_test cpp-netlib-message_transform_test cpp-netlib-http_localhost_tests cpp-netlib-https_localhost_tests cpp-netlib-url_test PROPERTIESRUNTIME_OUTPUT_DIRECTORY ../../../build/tests)
3447
add_test(cpp-netlib-hello_world python httplib_acceptance.py ../../../build/tests/cpp-netlib-hello_world ../../../build/tests/cpp-netlib-hello_world.passed)
3548
add_test(cpp-netlib-http_1_0_test ../../../build/tests/cpp-netlib-http_1_0_test)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp