[Boost-commit] svn:boost r49377 - in branches/release: . tools/quickbook/detail

Subject: [Boost-commit] svn:boost r49377 - in branches/release: . tools/quickbook/detail
From: daniel_james_at_[hidden]
Date: 2008-10-18 05:42:20

Author: danieljames
Date: 2008-10-18 05:42:19 EDT (Sat, 18 Oct 2008)
New Revision: 49377
URL: http://svn.boost.org/trac/boost/changeset/49377

Log:
Rollback the quickbook workaround for windows newlines in case it is the cause
of the recent problems with the release documentation build.

Rolled back revisions 49230-49231 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/tools/quickbook/detail/template_stack.hpp |     3 +--                                     
   branches/release/tools/quickbook/detail/utils.cpp          |    21 +--------------------                   
   2 files changed, 2 insertions(+), 22 deletions(-)

Modified: branches/release/tools/quickbook/detail/template_stack.hpp
==============================================================================
--- branches/release/tools/quickbook/detail/template_stack.hpp	(original)
+++ branches/release/tools/quickbook/detail/template_stack.hpp	2008-10-18 05:42:19 EDT (Sat, 18 Oct 2008)
@@ -17,7 +17,6 @@
 #include <boost/spirit/iterator/position_iterator.hpp>
 #include <boost/spirit/utility/functor_parser.hpp>
 #include <boost/spirit/symbols/symbols.hpp>
-#include <boost/next_prior.hpp>
 
 namespace quickbook
 {
@@ -64,7 +63,7 @@
                     scan.first = f;
                 }
                 if (len >= 0)
-                    scan.first = boost::next(f, len);
+                    scan.first = f+len;
                 return len;
             }
             

Modified: branches/release/tools/quickbook/detail/utils.cpp
==============================================================================
--- branches/release/tools/quickbook/detail/utils.cpp	(original)
+++ branches/release/tools/quickbook/detail/utils.cpp	2008-10-18 05:42:19 EDT (Sat, 18 Oct 2008)
@@ -181,25 +181,6 @@
         }
     }
 
-    // Copy a string, converting mac and windows style newlines to unix
-    // newlines.
-
-    template <class InputIterator, class OutputIterator>
-    void normalize_newlines(InputIterator begin, InputIterator end,
-            OutputIterator out)
-    {
-        while(begin != end) {
-            if(*begin == '\r') {
-                *out++ = '\n';
-                ++begin;
-                if(begin != end && *begin == '\n') ++begin;
-            }
-            else {
-                *out++ = *begin++;
-            }
-        }
-    }
-
     int load(std::string const& filename, std::string& storage)
     {
         using std::cerr;
@@ -219,7 +200,7 @@
         // Turn off white space skipping on the stream
         in.unsetf(ios::skipws);
 
-        normalize_newlines(
+        std::copy(
             istream_iterator<char>(in),
             istream_iterator<char>(),
             std::back_inserter(storage));