Progress on build of some tests.

deanberris · deanberris · commit ed4d247d6724 · 2011-11-26T23:48:16.000+11:00
This resolves some dependency issues on the
cppnetlib-http-client-connections lib. From here on out I'm moving on to
the development of the meat of the client implementation, as well as the
functionality.

It looks like (at least optimistically) the event horizon is at least
visible from this black hole.
diff --git a/boost/network/protocol/http/client/simple_connection_manager.ipp b/boost/network/protocol/http/client/simple_connection_manager.ipp
@@ -55,7 +55,6 @@ struct simple_connection_manager_pimpl {
   bool cache_resolved_, follow_redirects_;
   optional<std::string> openssl_certificate_, openssl_verify_path_;
   shared_ptr<connection_factory> connection_factory_;
-
 };
 
 simple_connection_manager::simple_connection_manager(bool cache_resolved,
diff --git a/boost/network/uri/accessors.hpp b/boost/network/uri/accessors.hpp
@@ -51,6 +51,7 @@ Map &query_map(const uri &uri_, Map &map) {
     return map;
 }
 
+inline
 std::string username(const uri &uri_) {
     uri::const_range_type user_info_range = uri_.user_info_range();
     uri::const_iterator it(boost::begin(user_info_range)), end(boost::end(user_info_range));
@@ -62,6 +63,7 @@ std::string username(const uri &uri_) {
     return std::string(boost::begin(user_info_range), it);
 }
 
+inline
 std::string password(const uri &uri_) {
     uri::const_range_type user_info_range = uri_.user_info_range();
     uri::const_iterator it(boost::begin(user_info_range)), end(boost::end(user_info_range));
@@ -74,20 +76,23 @@ std::string password(const uri &uri_) {
     return std::string(it, boost::end(user_info_range));
 }
 
+inline
 std::string decoded_path(const uri &uri_) {
     uri::const_range_type path_range = uri_.path_range();
     std::string decoded_path;
     decode(path_range, std::back_inserter(decoded_path));
     return decoded_path;
 }
 
+inline
 std::string decoded_query(const uri &uri_) {
     uri::const_range_type query_range = uri_.query_range();
     std::string decoded_query;
     decode(query_range, std::back_inserter(decoded_query));
     return decoded_query;
 }
 
+inline
 std::string decoded_fragment(const uri &uri_) {
     uri::const_range_type fragment_range = uri_.fragment_range();
     std::string decoded_fragment;
diff --git a/boost/network/uri/uri.hpp b/boost/network/uri/uri.hpp
@@ -292,6 +292,7 @@ bool is_hierarchical(const uri &uri_) {
     return false;
 }
 
+inline
 bool is_opaque(const uri &uri_) {
     return false;
 }
diff --git a/libs/network/build/CMakeLists.txt b/libs/network/build/CMakeLists.txt
@@ -13,3 +13,12 @@ add_library(cppnetlib-http-message
     STATIC
     ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/http/request.cpp
     ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/http/response.cpp)
+add_library(cppnetlib-http-client-connections
+    STATIC
+    ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/http/client_connections.cpp
+    ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/http/simple_connection_manager.cpp
+    ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/http/simple_connection_factory.cpp
+    ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/http/connection_delegate_factory.cpp)
+add_library(cppnetlib-http-client
+    STATIC
+    ${CPP-NETLIB_SOURCE_DIR}/libs/network/src/http/client.cpp)
diff --git a/libs/network/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt
@@ -35,5 +35,9 @@ set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
     http/connection_delegate_factory.cpp)
 add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
 
+set(CPP-NETLIB_HTTP_CLIENT_SRCS
+    http/client.cpp)
+add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})
+
 set(CPP-NETLIB_UTILS_THREAD_POOL_SRCS utils/thread_pool.cpp)
 add_library(cppnetlib-utils-thread_pool ${CPP-NETLIB_UTILS_THREAD_POOL_SRCS})
diff --git a/libs/network/test/http/CMakeLists.txt b/libs/network/test/http/CMakeLists.txt
@@ -35,14 +35,16 @@ if (Boost_FOUND)
             cppnetlib-uri
             cppnetlib-message
             cppnetlib-http-message
-            cppnetlib-client-connections)
+            cppnetlib-http-client
+            cppnetlib-http-client-connections)
         target_link_libraries(cpp-netlib-http-${test}
             ${Boost_LIBRARIES}
             ${CMAKE_THREAD_LIBS_INIT}
             cppnetlib-uri
             cppnetlib-message
             cppnetlib-http-message
-            cppnetlib-client-connections)
+            cppnetlib-http-client
+            cppnetlib-http-client-connections)
         if (OPENSSL_FOUND)
             target_link_libraries(cpp-netlib-http-${test} ${OPENSSL_LIBRARIES})
         endif()

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ bool is_hierarchical(const uri &uri_) {`
`292`	`292`	`return false;`
`293`	`293`	`}`
`294`	`294`
	`295`	`+inline`
`295`	`296`	`bool is_opaque(const uri &uri_) {`
`296`	`297`	`return false;`
`297`	`298`	`}`