Commit6e090b3

committed

Merge pull request#494 from el-bart/0.11-devel

0.11 devel- GCC compilation warnings fixed

2 parents07aa9fd +ba3b3f3 commit6e090b3Copy full SHA for 6e090b3

File tree

-2

lines changed

libs
- mime/test
  - mime-roundtrip.cpp
- network/example/http
  - fileserver.cpp

-2

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,6 @@ void test_roundtrip(const char *fileName) {`
`76`	`76`	`BOOST_CHECK_EQUAL(readfile(fileName),from_mime(mp));`
`77`	`77`	`}`
`78`	`78`
`79`		`-voidtest_expected_parse_fail(constchar *) {}`
`80`	`79`	`}`
`81`	`80`
`82`	`81`	`usingnamespaceboost::unit_test;`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`#include<sys/fcntl.h>`
`13`	`13`	`#include<unistd.h>`
`14`	`14`	`#include<iostream>`
	`15`	`+#include<cassert>`
`15`	`16`
`16`	`17`	`namespacehttp= boost::network::http;`
`17`	`18`	`namespaceutils= boost::network::utils;`
`@@ -142,7 +143,8 @@ struct connection_handler : boost::enable_shared_from_this<connection_handler> {`
`142`	`143`	`voidhandle_chunk(std::pair<void *, std::size_t> mmaped_region,off_t offset,`
`143`	`144`	`server::connection_ptr connection,`
`144`	`145`	`boost::system::error_codeconst &ec) {`
`145`		`-if (!ec && offset < mmaped_region.second)`
	`146`	`+assert(offset>=0);`
	`147`	`+if (!ec &&static_cast<std::size_t>(offset) < mmaped_region.second)`
`146`	`148`	`send_file(mmaped_region, offset, connection);`
`147`	`149`	`}`
`148`	`150`

Comments

(0)