Finalized changes to std-ification.

Author: deanberris

CMakeLists.txt

@@ -24,9 +24,9 @@ else()
 endif()
 set(Boost_USE_MULTITHREADED ON)
 if(CPP-NETLIB_BUILD_TESTS)
-  set(Boost_COMPONENTS unit_test_framework system regex date_time thread chrono filesystem program_options )
+  set(Boost_COMPONENTS unit_test_framework system regex date_time filesystem program_options )
 else()
-  set(Boost_COMPONENTS system regex date_time thread chrono filesystem program_options )
+  set(Boost_COMPONENTS system regex date_time filesystem program_options )
 endif()
 find_package( Boost 1.51 REQUIRED ${Boost_COMPONENTS} )
 find_package( OpenSSL )

include/network/include/http/server.hpp

@@ -9,7 +9,7 @@
 #ifndef NETWORK_INCLUDE_HTTP_SERVER_HPP_
 #define NETWORK_INCLUDE_HTTP_SERVER_HPP_
 
-#include <asio/io_service.hpp>
+#include <boost/asio/io_service.hpp>
 #include <network/protocol/http/server.hpp>
 #include <network/utils/thread_pool.hpp>
 #include <network/detail/debug.hpp>

include/network/protocol/http/client/macros.hpp

@@ -12,7 +12,7 @@
 
 #ifndef NETWORK_HTTP_BODY_CALLBACK
 #define NETWORK_HTTP_BODY_CALLBACK(function_name, range_name, error_name) \
-        void function_name (boost::iterator_range<const char*> const & range_name, asio::error_code const & error_name)
+        void function_name (boost::iterator_range<const char*> const & range_name, boost::system::error_code const & error_name)
 #endif
 
 #endif /* NETWORK_PROTOCOL_HTTP_CLIENT_MACROS_HPP_20110430 */

include/network/protocol/http/request/request.hpp

@@ -7,6 +7,10 @@
 #ifndef NETWORK_PROTOCOL_HTTP_REQUEST_REQUEST_HPP_20111021
 #define NETWORK_PROTOCOL_HTTP_REQUEST_REQUEST_HPP_20111021
 
+#ifndef NETWORK_DEFAULT_CHUNK_SIZE
+#define NETWORK_DEFAULT_CHUNK_SIZE 4096
+#endif  // NETWORK_DEFAULT_CHUNK_SIZE
+
 #include <network/protocol/http/request/request_base.hpp>
 #include <network/uri.hpp>
 #include <network/protocol/http/message/directives/major_version.hpp>

include/network/protocol/http/request/request.ipp

@@ -246,6 +246,10 @@ void request::get_body(std::function<void(std::string::const_iterator, size_t)>
   chunk_reader(local_buffer.cbegin(), bytes_read);
 }
 
+void request::get_body(std::function<void(std::string::const_iterator, size_t)> chunk_reader) const {
+  this->get_body(chunk_reader, NETWORK_DEFAULT_CHUNK_SIZE);
+}
+
 // From request_base...
 // Setters
 void request::set_method(std::string const & method) {

libs/network/example/CMakeLists.txt

@@ -20,21 +20,17 @@ add_executable(hello_world_client http/hello_world_client.cpp)
 #  add_executable(fileserver http/fileserver.cpp)
 #endif (UNIX)
 set(BOOST_CLIENT_LIBS
-    ${Boost_CHRONO_LIBRARY}
     ${Boost_DATE_TIME_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
 	${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${Boost_REGEX_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
 	)
 set(BOOST_SERVER_LIBS
-    ${Boost_CHRONO_LIBRARY}
     ${Boost_DATE_TIME_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
 	${Boost_FILESYSTEM_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
 	)
 
 target_link_libraries(uri_builder

libs/network/test/http/request_base_test.cpp

@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE(request_storage_flow) {
   static char data[] =
   "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus vitae ante sed nunc dapibus convallis in at neque. Vestibulum sed congue nunc. Sed tempus lorem non dui ultrices porttitor porta ligula venenatis. Sed a orci gravida tellus condimentum laoreet. Vivamus pulvinar, tortor eu adipiscing tempus, dolor urna tincidunt enim, id pretium eros ante quis dui. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In hac habitasse platea dictumst. Maecenas mattis metus.";
   simple.append(data, sizeof(data));
-  char output[sizeof(data)];
+  std::string output;
   size_t bytes_read = simple.read(output, 0, sizeof(data));
   BOOST_CHECK_EQUAL(bytes_read, sizeof(data));
   std::string flattened;
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(request_storage_copy) {
   request_test original(64);
   static char quick_brown[] = "The quick brown fox jumps over the lazy dog.";
   original.append(quick_brown, sizeof(quick_brown));
-  char output[sizeof(quick_brown)];
+  std::string output;
   request_test copy(original);
   size_t bytes_read = copy.read(output, 0, sizeof(quick_brown));
   BOOST_CHECK_EQUAL(bytes_read, sizeof(quick_brown));