Commit864e76d

committed

Changes to compile with gcc 4.2.1 on OSX 10.6.6.

1 parent3b28e1e commit864e76dCopy full SHA for 864e76d

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@ namespace boost { namespace network { namespace http {`
`514`	`514`	`voidcontinue_write(Range range, boost::function<void(boost::system::error_code)> callback) {`
`515`	`515`	`thread_pool().post(`
`516`	`516`	`boost::bind(`
`517`		`- &async_connection<Tag,Handler>::write_impl<Range>`
	`517`	`+ &async_connection<Tag,Handler>::templatewrite_impl<Range>`
`518`	`518`	`, async_connection<Tag,Handler>::shared_from_this()`
`519`	`519`	`, range, callback));`
`520`	`520`	`}`
`@@ -610,15 +610,15 @@ namespace boost { namespace network { namespace http {`
`610`	`610`	`if (!headers_already_sent && !headers_in_progress) {`
`611`	`611`	`write_headers_only(`
`612`	`612`	`boost::bind(`
`613`		`- &async_connection<Tag,Handler>::continue_write<Range>`
	`613`	`+ &async_connection<Tag,Handler>::templatecontinue_write<Range>`
`614`	`614`	`, async_connection<Tag,Handler>::shared_from_this()`
`615`	`615`	`, range, callback_function`
`616`	`616`	`));`
`617`	`617`	`return;`
`618`	`618`	`}elseif (headers_in_progress && !headers_already_sent) {`
`619`	`619`	`pending_actions.push_back(`
`620`	`620`	`boost::bind(`
`621`		`- &async_connection<Tag,Handler>::continue_write<Range>`
	`621`	`+ &async_connection<Tag,Handler>::templatecontinue_write<Range>`
`622`	`622`	`, async_connection<Tag,Handler>::shared_from_this()`
`623`	`623`	`, range, callback_function));`
`624`	`624`	`return;`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,11 @@ struct file_cache {`
`47`	`47`	`boost::upgrade_lock<boost::shared_mutex>lock(cache_mutex);`
`48`	`48`	`std::string real_filename = doc_root_+path;`
`49`	`49`	`if (regions.find(real_filename) != regions.end())returntrue;`
	`50`	`+#ifdef O_NOATIME`
`50`	`51`	`int fd =open(real_filename.c_str(), O_RDONLY\|O_NOATIME\|O_NONBLOCK);`
	`52`	`+#else`
	`53`	`+int fd =open(real_filename.c_str(), O_RDONLY\|O_NONBLOCK);`
	`54`	`+#endif`
`51`	`55`	`if (fd == -1)returnfalse;`
`52`	`56`	`std::size_t size =lseek(fd,0, SEEK_END);`
`53`	`57`	`void * region =mmap(0, size, PROT_READ, MAP_PRIVATE, fd,0);`

Comments

(0)