Changes to compile with gcc 4.2.1 on OSX 10.6.6.

emreturkay · emreturkay · commit 864e76dacbf1 · 2011-02-15T20:17:57.000+02:00
diff --git a/boost/network/protocol/http/server/async_connection.hpp b/boost/network/protocol/http/server/async_connection.hpp
@@ -514,7 +514,7 @@ namespace boost { namespace network { namespace http {
         void continue_write(Range range, boost::function<void(boost::system::error_code)> callback) {
             thread_pool().post(
                 boost::bind(
-                    &async_connection<Tag,Handler>::write_impl<Range> 
+                    &async_connection<Tag,Handler>::template write_impl<Range> 
                     , async_connection<Tag,Handler>::shared_from_this()
                     , range, callback));
         }
@@ -610,15 +610,15 @@ namespace boost { namespace network { namespace http {
             if (!headers_already_sent && !headers_in_progress) {
                 write_headers_only(
                     boost::bind(
-                        &async_connection<Tag,Handler>::continue_write<Range>
+                        &async_connection<Tag,Handler>::template continue_write<Range>
                         , async_connection<Tag,Handler>::shared_from_this()
                         , range, callback_function
                     ));
                 return;
             } else if (headers_in_progress && !headers_already_sent) {
                 pending_actions.push_back(
                     boost::bind(
-                        &async_connection<Tag,Handler>::continue_write<Range>
+                        &async_connection<Tag,Handler>::template continue_write<Range>
                         , async_connection<Tag,Handler>::shared_from_this()
                         , range, callback_function));
                 return;
diff --git a/libs/network/example/http/fileserver.cpp b/libs/network/example/http/fileserver.cpp
@@ -47,7 +47,11 @@ struct file_cache {
         boost::upgrade_lock<boost::shared_mutex> lock(cache_mutex);
         std::string real_filename = doc_root_+path;
         if (regions.find(real_filename) != regions.end()) return true;
+#ifdef O_NOATIME
         int fd = open(real_filename.c_str(), O_RDONLY|O_NOATIME|O_NONBLOCK);
+#else
+        int fd = open(real_filename.c_str(), O_RDONLY|O_NONBLOCK);
+#endif
         if (fd == -1) return false;
         std::size_t size = lseek(fd, 0, SEEK_END);
         void * region = mmap(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
