Add one_liner to build script to make sure it compiles and runs on MSVC 10.

glynos · glynos · commit 553ecede12e3 · 2011-11-25T19:47:35.000+01:00
diff --git a/boost/network/protocol/http/impl/request.hpp b/boost/network/protocol/http/impl/request.hpp
@@ -50,7 +50,7 @@ namespace http {
     struct basic_request : public basic_message<Tag>
     {
 
-        mutable boost::network::uri::basic_uri<typename string<Tag>::type> uri_;
+        mutable boost::network::uri::uri uri_;
         typedef basic_message<Tag> base_type;
 
     public:
@@ -121,7 +121,7 @@ namespace http {
             uri_ = new_uri;
         }
 
-        boost::network::uri::basic_uri<typename string<Tag>::type> const & uri() const {
+        boost::network::uri::uri const & uri() const {
             return uri_;
         }
 
diff --git a/boost/network/protocol/http/message/wrappers/uri.hpp b/boost/network/protocol/http/message/wrappers/uri.hpp
@@ -24,7 +24,7 @@ namespace boost { namespace network { namespace http {
             operator string_type() {
                 return message_.uri().raw();
             }
-            operator boost::network::uri::basic_uri<typename string<Tag>::type> () {
+            operator boost::network::uri::uri () {
                 return message_.uri();
             }
         };
diff --git a/libs/network/example/CMakeLists.txt b/libs/network/example/CMakeLists.txt
@@ -34,6 +34,10 @@ if (Boost_FOUND)
       target_link_libraries(simple_wget ${OPENSSL_LIBRARIES})
     endif (OPENSSL_FOUND)
 
+    add_executable(one_liner http/one_liner.cpp)
+    target_link_libraries(one_liner ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} cppnetlib-uri)
+    set_target_properties(one_liner PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
+
     add_executable(hello_world_server http/hello_world_server.cpp)
     target_link_libraries(hello_world_server ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} )
     set_target_properties(hello_world_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ namespace http {`
`50`	`50`	`struct basic_request : public basic_message<Tag>`
`51`	`51`	`{`
`52`	`52`
`53`		`- mutable boost::network::uri::basic_uri<typename string<Tag>::type> uri_;`
	`53`	`+ mutable boost::network::uri::uri uri_;`
`54`	`54`	`typedef basic_message<Tag> base_type;`
`55`	`55`
`56`	`56`	`public:`
`@@ -121,7 +121,7 @@ namespace http {`
`121`	`121`	`uri_ = new_uri;`
`122`	`122`	`}`
`123`	`123`
`124`		`- boost::network::uri::basic_uri<typename string<Tag>::type> const & uri() const {`
	`124`	`+ boost::network::uri::uri const & uri() const {`
`125`	`125`	`return uri_;`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace boost { namespace network { namespace http {`
`24`	`24`	`operator string_type() {`
`25`	`25`	`return message_.uri().raw();`
`26`	`26`	`}`
`27`		`- operator boost::network::uri::basic_uri<typename string<Tag>::type> () {`
	`27`	`+ operator boost::network::uri::uri () {`
`28`	`28`	`return message_.uri();`
`29`	`29`	`}`
`30`	`30`	`};`