Merge branch 'develop' into project/flat-ui-fonts-update

1 files changed, 5 insertions, 8 deletions

diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
index 670b740133..4a01ec567e 100644
--- a/indra/llcommon/llprocess.cpp
+++ b/indra/llcommon/llprocess.cpp
@@ -176,13 +176,13 @@ public:
             // In general, our streambuf might contain a number of different
             // physical buffers; iterate over those.
             bool keepwriting = true;
-            for (const_buffer_sequence::const_iterator bufi(bufs.begin()), bufend(bufs.end());
+            for (auto bufi(boost::asio::buffer_sequence_begin(bufs)), bufend(boost::asio::buffer_sequence_end(bufs));
                  bufi != bufend && keepwriting; ++bufi)
             {
                 // http://www.boost.org/doc/libs/1_49_0_beta1/doc/html/boost_asio/reference/buffer.html#boost_asio.reference.buffer.accessing_buffer_contents
                 // Although apr_file_write() accepts const void*, we
                 // manipulate const char* so we can increment the pointer.
-                const char* remainptr = boost::asio::buffer_cast<const char*>(*bufi);
+                const char* remainptr = static_cast<const char*>(bufi->data());
                 std::size_t remainlen = boost::asio::buffer_size(*bufi);
                 while (remainlen)
                 {
@@ -377,14 +377,14 @@ public:
             // In general, the mutable_buffer_sequence returned by prepare() might
             // contain a number of different physical buffers; iterate over those.
             std::size_t tocommit(0);
-            for (mutable_buffer_sequence::const_iterator bufi(bufs.begin()), bufend(bufs.end());
+            for (auto bufi(boost::asio::buffer_sequence_begin(bufs)), bufend(boost::asio::buffer_sequence_end(bufs));
                  bufi != bufend; ++bufi)
             {
                 // http://www.boost.org/doc/libs/1_49_0_beta1/doc/html/boost_asio/reference/buffer.html#boost_asio.reference.buffer.accessing_buffer_contents
                 std::size_t toread(boost::asio::buffer_size(*bufi));
                 apr_size_t gotten(toread);
                 apr_status_t err = apr_file_read(mPipe,
-                                                 boost::asio::buffer_cast<void*>(*bufi),
+                                                 bufi->data(),
                                                  &gotten);
                 // EAGAIN is exactly what we want from a nonblocking pipe.
                 // Rather than waiting for data, it should return immediately.
@@ -657,10 +657,7 @@ LLProcess::LLProcess(const LLSDOrParams& params):
     // case), e.g. by calling operator(), returns a reference to *the same
     // instance* of the wrapped type that's stored in our Block subclass.
     // That's important! We know 'params' persists throughout this method
-    // call; but without that guarantee, we'd have to assume that converting
-    // one of its members to std::string might return a different (temp)
-    // instance. Capturing the c_str() from a temporary std::string is Bad Bad
-    // Bad. But armed with this knowledge, when you see params.cwd().c_str(),
+    // call; but without that guarantee, when you see params.cwd().c_str(),
     // grit your teeth and smile and carry on.
 
     if (params.cwd.isProvided())