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

Commit2d34606

Browse files
committed
Refactor build and cleaned headers.
1 parent4660197 commit2d34606

File tree

15 files changed

+285
-331
lines changed

15 files changed

+285
-331
lines changed

‎boost/network/uri/accessors.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include<boost/network/uri/encode.hpp>
1313
#include<boost/network/uri/decode.hpp>
1414
#include<boost/spirit/include/qi.hpp>
15+
#include<boost/fusion/include/std_pair.hpp>
1516

1617

1718
namespaceboost {

‎boost/network/uri/detail/parse_uri.hpp‎

Lines changed: 0 additions & 274 deletions
This file was deleted.

‎boost/network/uri/uri.hpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
#include<boost/network/traits/string.hpp>
1212
#include<boost/network/constants.hpp>
1313
#include<boost/network/uri/detail/uri_parts.hpp>
14-
#ifdef BOOST_NETWORK_NO_LIB
15-
#include<boost/network/uri/detail/parse_uri.hpp>
16-
#endif// #ifdef BOOST_NETWORK_NO_LIB
17-
#include<boost/fusion/include/std_pair.hpp>
1814
#include<boost/fusion/sequence/intrinsic/at_c.hpp>
1915
#include<boost/algorithm/string.hpp>
2016
#include<boost/range/iterator_range.hpp>

‎libs/network/build/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include_directories(${CPP-NETLIB_SOURCE_DIR})
22
find_package( Boost 1.43.0 COMPONENTS unit_test_frameworksystemregex thread filesystem )
33

4-
add_library(cppnetlib-uri-parsersSTATIC ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/parse_uri_impl.cpp)
4+
add_library(cppnetlib-uriSTATIC ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/parse_uri_impl.cpp)
55
add_library(cppnetlib-server-parsersSTATIC ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/server_request_parsers_impl.cpp)
66

‎libs/network/build/Jamfile.v2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ project cpp-netlib :
1818

1919
cpp-pch client : boost/network/include/http/client.hpp ;
2020
cpp-pch server : boost/network/include/http/server.hpp ;
21-
lib cppnetlib-uri-parsers : libs/network/src/parse_uri_impl.cpp ;
21+
lib cppnetlib-uri : libs/network/src/parse_uri_impl.cpp ;
2222
lib cppnetlib-server-parsers : libs/network/src/server_request_parsers_impl.cpp ;
2323

2424
install headers : client server
2525
: <location>../../../boost/network/include/http ;
2626

27-
install libraries : cppnetlib-uri-parsers cppnetlib-server-parsers ;
27+
install libraries : cppnetlib-uri cppnetlib-server-parsers ;
2828

29-
alias all : headers ;
29+
alias all : headers ;
3030

‎libs/network/example/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ endif (OPENSSL_FOUND)
1919

2020
if (Boost_FOUND)
2121
add_executable(http_client http_client.cpp)
22-
add_dependencies(http_client cppnetlib-uri-parsers)
23-
target_link_libraries(http_client${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
22+
add_dependencies(http_client cppnetlib-uri)
23+
target_link_libraries(http_client${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
2424
set_target_properties(http_client PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
2525
if (OPENSSL_FOUND)
2626
target_link_libraries(http_client${OPENSSL_LIBRARIES})
2727
endif (OPENSSL_FOUND)
2828

2929
add_executable(simple_wget simple_wget.cpp)
30-
add_dependencies(simple_wget cppnetlib-uri-parsers)
31-
target_link_libraries(simple_wget${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri-parsers)
30+
add_dependencies(simple_wget cppnetlib-uri)
31+
target_link_libraries(simple_wget${Boost_LIBRARIES}${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
3232
set_target_properties(simple_wget PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
3333
if (OPENSSL_FOUND)
3434
target_link_libraries(simple_wget${OPENSSL_LIBRARIES})
@@ -45,13 +45,13 @@ if (Boost_FOUND)
4545
endif (UNIX)
4646

4747
add_executable(uri uri.cpp)
48-
add_dependencies(uri cppnetlib-uri-parsers)
49-
target_link_libraries(uri cppnetlib-uri-parsers)
48+
add_dependencies(uri cppnetlib-uri)
49+
target_link_libraries(uri cppnetlib-uri)
5050
set_target_properties(uri PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
5151

5252
add_executable(uri_builder uri_builder.cpp)
53-
add_dependencies(uri_builder cppnetlib-uri-parsers)
54-
target_link_libraries(uri_builder cppnetlib-uri-parsers)
53+
add_dependencies(uri_builder cppnetlib-uri)
54+
target_link_libraries(uri_builder cppnetlib-uri)
5555
set_target_properties(uri_builder PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
5656

5757
endif()

‎libs/network/example/Jamfile.v2‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ project network_test :
2121
<variant>debug:<define>BOOST_NETWORK_DEBUG
2222
;
2323

24-
exe http_client : http_client.cpp /cpp-netlib//cppnetlib-uri-parsers ;
24+
exe http_client : http_client.cpp /cpp-netlib//cppnetlib-uri ;
2525

2626
# exe dispatch_table : dispatch_table.cpp ;
2727

28-
exe uri : uri.cpp /cpp-netlib//cppnetlib-uri-parsers ;
28+
exe uri : uri.cpp /cpp-netlib//cppnetlib-uri ;
2929

30-
exe simple_wget : simple_wget.cpp /cpp-netlib//cppnetlib-uri-parsers ;
30+
exe simple_wget : simple_wget.cpp /cpp-netlib//cppnetlib-uri ;
3131

3232
exe hello_world_server : http/hello_world_server.cpp /cpp-netlib//cppnetlib-server-parsers ;
3333

34-
exe hello_world_client : http/hello_world_client.cpp /cpp-netlib//cppnetlib-uri-parsers ;
34+
exe hello_world_client : http/hello_world_client.cpp /cpp-netlib//cppnetlib-uri ;
3535

36-
exe one_liner : http/one_liner.cpp /cpp-netlib//cppnetlib-uri-parsers ;
36+
exe one_liner : http/one_liner.cpp /cpp-netlib//cppnetlib-uri ;
3737

3838
exe fileserver : http/fileserver.cpp /cpp-netlib//cppnetlib-server-parsers ;
3939

‎libs/network/src/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
include_directories(${CPP-NETLIB_SOURCE_DIR})
1010
set(CPP-NETLIB_URI_SRCS uri/parse.cpp)
11-
add_library(cppnetlib-uri-parsers ${CPP-NETLIB_URI_SRCS})
11+
add_library(cppnetlib-uri ${CPP-NETLIB_URI_SRCS})
1212

1313
set(CPP-NETLIB_HTTP_SERVER_SRCS server_request_parsers_impl.cpp)
1414
add_library(cppnetlib-server-parsers ${CPP-NETLIB_HTTP_SERVER_SRCS})

0 commit comments

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