Update Travis and Appveyor configurations

Refactor stream write functionality into a standalone utility

.travis.yml

@@ -1,4 +1,5 @@
 # Copyright 2016, 2017 Peter Dimov
+# Copyright 2019 Andrey Semashev
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -24,12 +25,32 @@ matrix:
     - env: BOGUS_JOB=true
 
   include:
+# gcc, Linux
     - os: linux
-      compiler: g++
-      env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
+      dist: trusty
+      compiler: gcc-4.4
+      env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.4
+          sources:
+            - ubuntu-toolchain-r-test
 
     - os: linux
-      compiler: g++-4.7
+      dist: trusty
+      compiler: gcc-4.6
+      env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
+      addons:
+        apt:
+          packages:
+            - g++-4.6
+          sources:
+            - ubuntu-toolchain-r-test
+
+    - os: linux
+      dist: trusty
+      compiler: gcc-4.7
       env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
       addons:
         apt:
@@ -39,7 +60,8 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      compiler: g++-4.8
+      dist: xenial
+      compiler: gcc-4.8
       env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
       addons:
         apt:
@@ -47,8 +69,10 @@ matrix:
             - g++-4.8
           sources:
             - ubuntu-toolchain-r-test
+
     - os: linux
-      compiler: g++-4.9
+      dist: xenial
+      compiler: gcc-4.9
       env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
       addons:
         apt:
@@ -58,7 +82,8 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      compiler: g++-5
+      dist: xenial
+      compiler: gcc-5
       env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14,1z
       addons:
         apt:
@@ -68,7 +93,8 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      compiler: g++-6
+      dist: xenial
+      compiler: gcc-6
       env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z
       addons:
         apt:
@@ -78,8 +104,8 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      dist: trusty
-      compiler: g++-7
+      dist: xenial
+      compiler: gcc-7
       env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
       addons:
         apt:
@@ -89,9 +115,9 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      dist: trusty
-      compiler: g++-8
-      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17
+      dist: xenial
+      compiler: gcc-8
+      env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
@@ -100,22 +126,34 @@ matrix:
             - ubuntu-toolchain-r-test
 
     - os: linux
-      compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
+      dist: bionic
+      compiler: gcc-9
+      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - g++-9
+          sources:
+            - sourceline: "ppa:ubuntu-toolchain-r/test"
 
+# clang, Linux
     - os: linux
-      compiler: clang++-3.5
+      dist: trusty
+      compiler: clang-3.5
       env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11
       addons:
         apt:
           packages:
             - clang-3.5
+            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.5
+            - sourceline: "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.5 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
 
     - os: linux
-      compiler: clang++-3.6
+      dist: trusty
+      compiler: clang-3.6
       env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11,14,1z
       addons:
         apt:
@@ -124,10 +162,12 @@ matrix:
             - libstdc++-5-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.6
+            - sourceline: "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.6 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
 
     - os: linux
-      compiler: clang++-3.7
+      dist: trusty
+      compiler: clang-3.7
       env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11,14,1z
       addons:
         apt:
@@ -136,100 +176,172 @@ matrix:
             - libstdc++-5-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
+            - sourceline: "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.7 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
 
     - os: linux
-      compiler: clang++-3.8
+      dist: xenial
+      compiler: clang-3.8
       env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-3.8
-            - libstdc++-5-dev
+            - libstdc++-6-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.8
+            - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.8 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
 
     - os: linux
-      compiler: clang++-3.9
+      dist: xenial
+      compiler: clang-3.9
       env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-3.9
-            - libstdc++-5-dev
+            - libstdc++-6-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.9
+            - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
 
     - os: linux
-      compiler: clang++-4.0
+      dist: xenial
+      compiler: clang-4
       env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-4.0
-            - libstdc++-5-dev
+            - libstdc++-6-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-4.0
+            - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
 
     - os: linux
-      compiler: clang++-5.0
+      dist: xenial
+      compiler: clang-5
       env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
             - clang-5.0
-            - libstdc++-5-dev
+            - libstdc++-7-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
+            - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
 
     - os: linux
-      compiler: clang++-6.0
-      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17
+      dist: xenial
+      compiler: clang-6
+      env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
             - clang-6.0
-            - libstdc++-5-dev
+            - libstdc++-8-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-6.0
+            - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
 
     - os: linux
-      compiler: clang++-7
-      env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=03,11,14,17
+      dist: xenial
+      compiler: clang-7
+      env: TOOLSET=clang COMPILER=clang++-7 CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
             - clang-7
-            - libstdc++-5-dev
+            - libstdc++-8-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-7
+            - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
+
+    - os: linux
+      dist: xenial
+      compiler: clang-8
+      env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-8
+            - libstdc++-8-dev
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
+
+    - os: linux
+      dist: xenial
+      compiler: clang-9
+      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - clang-9
+            - libstdc++-9-dev
+          sources:
+            - sourceline: "ppa:ubuntu-toolchain-r/test"
+            - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
+
+    - os: linux
+      dist: xenial
+      compiler: clang-libc++
+      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a CXXFLAGS="-stdlib=libc++" LINKFLAGS="-stdlib=libc++"
+      addons:
+        apt:
+          packages:
+            - clang-9
+            - libc++-9-dev
+            - libc++abi-9-dev
+          sources:
+            - sourceline: "ppa:ubuntu-toolchain-r/test"
+            - sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main"
+              key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
+
+# clang, OS X
+# OS X builds are slow on Travis CI
+#    - os: osx
+#      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
+#      osx_image: xcode9.4
+#
+#    - os: osx
+#      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
+#      osx_image: xcode10.3
 
     - os: osx
-      compiler: clang++
-      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,17
+      osx_image: xcode11.2
 
 install:
-  - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
+  - GIT_FETCH_JOBS=8
+  - BOOST_BRANCH=develop
+  - if [ "$TRAVIS_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi
   - cd ..
   - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
-  - git submodule update --init tools/build
-  - git submodule update --init libs/assert
-  - git submodule update --init libs/config
-  - git submodule update --init libs/core
-  - git submodule update --init libs/preprocessor
-  - git submodule update --init libs/static_assert
-  - git submodule update --init libs/throw_exception
-  - git submodule update --init libs/type_traits
-  - git submodule update --init libs/container_hash
-  - git submodule update --init libs/integer
-  - git submodule update --init libs/detail
+  - git submodule init tools/build
+  - git submodule init tools/boost_install
+  - git submodule init libs/headers
+  - git submodule init libs/assert
+  - git submodule init libs/config
+  - git submodule init libs/core
+  - git submodule init libs/io
+  - git submodule init libs/preprocessor
+  - git submodule init libs/static_assert
+  - git submodule init libs/throw_exception
+  - git submodule init libs/type_traits
+  - git submodule init libs/container_hash
+  - git submodule init libs/integer
+  - git submodule init libs/detail
+  - git submodule update --jobs $GIT_FETCH_JOBS
   - cp -r $TRAVIS_BUILD_DIR/* libs/utility
   - ./bootstrap.sh
   - ./b2 headers
@@ -237,7 +349,8 @@ install:
 script:
   - |-
     echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
-  - ./b2 -j3 libs/utility/test toolset=$TOOLSET cxxstd=$CXXSTD
+  - BUILD_JOBS=`(nproc || sysctl -n hw.ncpu) 2> /dev/null`
+  - ./b2 -j $BUILD_JOBS libs/utility/test toolset=$TOOLSET cxxstd=$CXXSTD ${CXXFLAGS:+cxxflags="$CXXFLAGS"} ${LINKFLAGS:+linkflags="$LINKFLAGS"}
 
 notifications:
   email:

CMakeLists.txt

@@ -0,0 +1,27 @@
+# Copyright 2018 Peter Dimov
+# Copyright 2018 Andrey Semashev
+# Distributed under the Boost Software License, Version 1.0.
+# See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt
+
+# Partial (add_subdirectory only) and experimental CMake support
+# Subject to change; please do not rely on the contents of this file yet.
+
+cmake_minimum_required(VERSION 3.5)
+
+project(BoostUtility LANGUAGES CXX)
+
+add_library(boost_utility INTERFACE)
+add_library(Boost::utility ALIAS boost_utility)
+
+target_include_directories(boost_utility INTERFACE include)
+
+target_link_libraries(boost_utility
+    INTERFACE
+        Boost::config
+        Boost::container_hash
+        Boost::core
+        Boost::preprocessor
+        Boost::static_assert
+        Boost::throw_exception
+        Boost::type_traits
+)

appveyor.yml

@@ -1,4 +1,5 @@
-# Copyright 2016, 2017 Peter Dimov
+# Copyright 2016-2019 Peter Dimov
+# Copyright 2019 Andrey Semashev
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -14,32 +15,67 @@ branches:
 
 environment:
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
-      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-14.0
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1
+    - TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - TOOLSET: msvc-14.0
+      ADDRMD: 32,64
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - TOOLSET: msvc-14.1
       CXXSTD: 14,17
+      ADDRMD: 32,64
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - TOOLSET: msvc-14.2
+      ADDRMD: 32,64
+      CXXSTD: 14,17
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    - TOOLSET: clang-win
+      ADDRMD: 32,64
+      CXXSTD: 14,17
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+      ADDPATH: C:\cygwin\bin;
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+      ADDPATH: C:\cygwin64\bin;
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+      ADDPATH: C:\mingw\bin;
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+      ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - TOOLSET: gcc
+      CXXSTD: 03,11,14,1z
+      ADDPATH: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin;
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 install:
+  - set GIT_FETCH_JOBS=8
   - set BOOST_BRANCH=develop
   - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
   - cd ..
   - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
   - cd boost-root
-  - git submodule update --init tools/build
-  - git submodule update --init libs/assert
-  - git submodule update --init libs/config
-  - git submodule update --init libs/core
-  - git submodule update --init libs/preprocessor
-  - git submodule update --init libs/static_assert
-  - git submodule update --init libs/throw_exception
-  - git submodule update --init libs/type_traits
-  - git submodule update --init libs/container_hash
-  - git submodule update --init libs/integer
-  - git submodule update --init libs/detail
-  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\utility
+  - git submodule init tools/build
+  - git submodule init tools/boost_install
+  - git submodule init libs/headers
+  - git submodule init libs/assert
+  - git submodule init libs/config
+  - git submodule init libs/core
+  - git submodule init libs/io
+  - git submodule init libs/preprocessor
+  - git submodule init libs/static_assert
+  - git submodule init libs/throw_exception
+  - git submodule init libs/type_traits
+  - git submodule init libs/container_hash
+  - git submodule init libs/integer
+  - git submodule init libs/detail
+  - git submodule update --jobs %GIT_FETCH_JOBS%
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\utility\
   - cmd /c bootstrap
   - b2 -d0 headers
 
@@ -48,4 +84,5 @@ build: off
 test_script:
   - PATH=%ADDPATH%%PATH%
   - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
-  - b2 -j3 libs/utility/test toolset=%TOOLSET% %CXXSTD%
+  - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
+  - b2 -j %NUMBER_OF_PROCESSORS% libs/utility/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release

doc/string_ref.qbk

@@ -156,6 +156,11 @@ String-like operations:
 [section History]
 [/===============]
 
+[heading boost 1.71]
+* Glen Fernandes updated the implementation of the stream insertion operator to
+write directly to the `basic_streambuf` and refactored that functionality into
+a common utility.
+
 [heading boost 1.53]
 * Introduced
     

include/boost/utility/string_ref.hpp

@@ -1,5 +1,6 @@
 /*
    Copyright (c) Marshall Clow 2012-2015.
+   Copyright (c) Glen Joseph Fernandes 2019 (glenjofe@gmail.com)
 
    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,6 +18,7 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
+#include <boost/io/ostream_put.hpp>
 #include <boost/utility/string_ref_fwd.hpp>
 #include <boost/throw_exception.hpp>
 
@@ -421,52 +423,11 @@ namespace boost {
         return basic_string_ref<charT, traits>(x) >= y;
         }
 
-    namespace detail {
-
-        template<class charT, class traits>
-        inline void sr_insert_fill_chars(std::basic_ostream<charT, traits>& os, std::size_t n) {
-            enum { chunk_size = 8 };
-            charT fill_chars[chunk_size];
-            std::fill_n(fill_chars, static_cast< std::size_t >(chunk_size), os.fill());
-            for (; n >= chunk_size && os.good(); n -= chunk_size)
-                os.write(fill_chars, static_cast< std::size_t >(chunk_size));
-            if (n > 0 && os.good())
-                os.write(fill_chars, n);
-            }
-
-        template<class charT, class traits>
-        void sr_insert_aligned(std::basic_ostream<charT, traits>& os, const basic_string_ref<charT,traits>& str) {
-            const std::size_t size = str.size();
-            const std::size_t alignment_size = static_cast< std::size_t >(os.width()) - size;
-            const bool align_left = (os.flags() & std::basic_ostream<charT, traits>::adjustfield) == std::basic_ostream<charT, traits>::left;
-            if (!align_left) {
-                detail::sr_insert_fill_chars(os, alignment_size);
-                if (os.good())
-                    os.write(str.data(), size);
-                }
-            else {
-                os.write(str.data(), size);
-                if (os.good())
-                    detail::sr_insert_fill_chars(os, alignment_size);
-                }
-            }
-
-        } // namespace detail
-
     // Inserter
     template<class charT, class traits>
     inline std::basic_ostream<charT, traits>&
     operator<<(std::basic_ostream<charT, traits>& os, const basic_string_ref<charT,traits>& str) {
-        if (os.good()) {
-            const std::size_t size = str.size();
-            const std::size_t w = static_cast< std::size_t >(os.width());
-            if (w <= size)
-                os.write(str.data(), size);
-            else
-                detail::sr_insert_aligned(os, str);
-            os.width(0);
-            }
-        return os;
+        return boost::io::ostream_put(os, str.data(), str.size());
         }
 
 #if 0

include/boost/utility/string_view.hpp

@@ -1,6 +1,7 @@
 /*
    Copyright (c) Marshall Clow 2012-2015.
    Copyright (c) Beman Dawes 2015
+   Copyright (c) Glen Joseph Fernandes 2019 (glenjofe@gmail.com)
 
    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -19,6 +20,7 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
+#include <boost/io/ostream_put.hpp>
 #include <boost/utility/string_view_fwd.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/container_hash/hash_fwd.hpp>
@@ -184,7 +186,7 @@ namespace boost {
             if (pos > size())
                 BOOST_THROW_EXCEPTION(std::out_of_range("string_view::copy" ));
             size_type rlen = (std::min)(n, len_ - pos);
-    		traits_type::copy(s, data() + pos, rlen);
+            traits_type::copy(s, data() + pos, rlen);
             return rlen;
             }
 
@@ -571,53 +573,12 @@ namespace boost {
         return basic_string_view<charT, traits>(x) >= y;
         }
 
-    namespace detail {
-
-        template<class charT, class traits>
-        inline void sv_insert_fill_chars(std::basic_ostream<charT, traits>& os, std::size_t n) {
-            enum { chunk_size = 8 };
-            charT fill_chars[chunk_size];
-            std::fill_n(fill_chars, static_cast< std::size_t >(chunk_size), os.fill());
-            for (; n >= chunk_size && os.good(); n -= chunk_size)
-                os.write(fill_chars, static_cast< std::size_t >(chunk_size));
-            if (n > 0 && os.good())
-                os.write(fill_chars, n);
-            }
-
-        template<class charT, class traits>
-        void sv_insert_aligned(std::basic_ostream<charT, traits>& os, const basic_string_view<charT,traits>& str) {
-            const std::size_t size = str.size();
-            const std::size_t alignment_size = static_cast< std::size_t >(os.width()) - size;
-            const bool align_left = (os.flags() & std::basic_ostream<charT, traits>::adjustfield) == std::basic_ostream<charT, traits>::left;
-            if (!align_left) {
-                detail::sv_insert_fill_chars(os, alignment_size);
-                if (os.good())
-                    os.write(str.data(), size);
-                }
-            else {
-                os.write(str.data(), size);
-                if (os.good())
-                    detail::sv_insert_fill_chars(os, alignment_size);
-                }
-            }
-
-        } // namespace detail
-
     // Inserter
     template<class charT, class traits>
     inline std::basic_ostream<charT, traits>&
     operator<<(std::basic_ostream<charT, traits>& os,
       const basic_string_view<charT,traits>& str) {
-        if (os.good()) {
-            const std::size_t size = str.size();
-            const std::size_t w = static_cast< std::size_t >(os.width());
-            if (w <= size)
-                os.write(str.data(), size);
-            else
-                detail::sv_insert_aligned(os, str);
-            os.width(0);
-            }
-        return os;
+        return boost::io::ostream_put(os, str.data(), str.size());
         }
 
 #if 0

index.html

@@ -12,29 +12,31 @@
 		<p>The Boost Utility Library isn't really a single library at all. It is just a 
 			collection for components too small to be called libraries in their own right.</p>
 		<p>But that doesn't mean there isn't useful stuff here. Take a look:</p>
-		<blockquote>
-			<p>
-				<a href="../core/doc/html/core/addressof.html">addressof</a> (moved to the Boost.Core library)<br>
-				<a href="doc/html/base_from_member.html">base_from_member</a><br>
-				<a href="utility.htm#BOOST_BINARY">BOOST_BINARY</a><br>
-				<a href="call_traits.htm">call_traits</a><br>
-				<a href="../core/doc/html/core/checked_delete.html">checked_delete</a> (moved to the Boost.Core library)<br>
-				<a href="doc/html/compressed_pair.html">compressed_pair</a><br>
-				<a href="../type_traits/doc/html/boost_typetraits/reference/declval.html">declval</a> (moved to the Boost.TypeTraits library)<br>
-				<a href="../core/doc/html/core/enable_if.html">enable_if</a> (moved to the Boost.Core library)<br>
-				<a href="in_place_factories.html">in_place_factory</a><br>
-				<a href="iterator_adaptors.htm">iterator_adaptors</a><br>
-				<a href="../iterator/doc/generator_iterator.htm">generator iterator adaptors</a> (moved to the Boost.Iterator library)<br>
-				<a href="../iterator/doc/html/iterator/algorithms/next_prior.html">next/prior</a> (moved to the Boost.Iterator library)<br>
-				<a href="../core/doc/html/core/noncopyable.html">noncopyable</a> (moved to the Boost.Core library)<br>
-				<a href="operators.htm">operators</a><br>
-				<a href="utility.htm#result_of">result_of</a><br>
-				<a href="throw_exception.html">throw_exception</a><br>
-				<a href="utility.htm">utility</a><br>
-            <a href="doc/html/string_ref.html">string_ref</a><br>
-            <a href="value_init.htm">value_init</a><br>
-         </p>
-		</blockquote>
+        <ul>
+        <li><a href="doc/html/base_from_member.html">base_from_member</a></li>
+        <li><a href="utility.htm#BOOST_BINARY">BOOST_BINARY</a></li>
+        <li><a href="call_traits.htm">call_traits</a></li>
+        <li><a href="doc/html/compressed_pair.html">compressed_pair</a></li>
+        <li><a href="in_place_factories.html">in_place_factory</a></li>
+        <li><a href="iterator_adaptors.htm">iterator_adaptors</a></li>
+        <li><a href="operators.htm">operators</a></li>
+        <li><a href="utility.htm#result_of">result_of</a></li>
+        <li><a href="throw_exception.html">throw_exception</a></li>
+        <li><a href="utility.htm">utility</a></li>
+        <li><a href="doc/html/string_ref.html">string_ref</a></li>
+        <li><a href="value_init.htm">value_init</a></li>
+        </ul>
+        <p>Over time useful stuff here has moved to more appropriate Boost libraries:</p>
+        <ul>
+        <li><a href="../core/doc/html/core/addressof.html">addressof</a> (moved to Boost.Core)</li>
+        <li><a href="../core/doc/html/core/checked_delete.html">checked_delete</a> (moved to Boost.Core)</li>
+        <li><a href="../type_traits/doc/html/boost_typetraits/reference/declval.html">declval</a> (moved to Boost.TypeTraits)</li>
+        <li><a href="../core/doc/html/core/enable_if.html">enable_if</a> (moved to Boost.Core)</li>
+        <li><a href="../iterator/doc/generator_iterator.htm">generator iterator adaptors</a> (moved to Boost.Iterator)</li>
+        <li><a href="../iterator/doc/html/iterator/algorithms/next_prior.html">next/prior</a> (moved to Boost.Iterator)</li>
+        <li><a href="../core/doc/html/core/noncopyable.html">noncopyable</a> (moved to Boost.Core)</li>
+        <li><a href="../io/doc/html/io.html">ostream_string</a> (moved to Boost.IO)</li>
+        </ul>
 		<hr>
 		<p>&copy; Copyright Beman Dawes, 2001</p>
         <p>Distributed under the Boost Software License, Version 1.0. (See 

meta/libraries.json

@@ -98,6 +98,19 @@
             "Daniel Walker <daniel.j.walker -at- gmail.com>"
         ]
     },
+    {
+        "key": "utility/string_ref",
+        "name": "string_ref",
+        "description": "String view templates.",
+        "documentation": "doc/html/string_ref.html",
+        "category": [
+            "Containers"
+        ],
+        "authors": "Marshall Clow",
+        "maintainers": [
+            "Marshall Clow <marshall -at- idio.com>"
+        ]
+    },
     {
         "key": "utility/value_initialized",
         "name": "Value Initialized",

operators.htm

@@ -119,8 +119,8 @@
     also want <code>x &gt; y, x &gt;= y,</code> and <code>x &lt;= y</code>.
     Moreover, unless your class has really surprising behavior, some of these
     related operators can be defined in terms of others (e.g. <code>x &gt;= y
-    &lt;=&gt; !(x &lt; y)</code>). Replicating this boilerplate for multiple
-    classes is both tedious and error-prone. The <cite><a href=
+    is equivalent to !(x &lt; y)</code>). Replicating this boilerplate for
+    multiple classes is both tedious and error-prone. The <cite><a href=
     "../../boost/operators.hpp">boost/operators.hpp</a></cite> templates help
     by generating operators for you at namespace scope based on other
     operators you've defined in your class.</p>

test/string_view_constexpr_test1.cpp

@@ -12,6 +12,7 @@
 #include <cstddef>    // for NULL, std::size_t, std::ptrdiff_t
 #include <cstring>    // for std::strchr and std::strcmp
 #include <cstdlib>    // for std::malloc and std::free
+#include <cstdio>     // for EOF
 
 #include <boost/config.hpp>
 #include <boost/utility/string_view.hpp>
@@ -19,11 +20,11 @@
 #if __cplusplus >= 201402L
 struct constexpr_char_traits
 {
-    typedef char		    char_type;
-    typedef int   			int_type;
-    typedef std::streamoff	off_type;
-    typedef std::streampos	pos_type;
-    typedef std::mbstate_t	state_type;
+    typedef char            char_type;
+    typedef int             int_type;
+    typedef std::streamoff  off_type;
+    typedef std::streampos  pos_type;
+    typedef std::mbstate_t  state_type;
 
     static void assign(char_type& c1, const char_type& c2) noexcept { c1 = c2; }
     static constexpr bool eq(char_type c1, char_type c2) noexcept   { return c1 == c2; }
@@ -43,11 +44,11 @@ struct constexpr_char_traits
     static constexpr int_type  eof() noexcept                                 { return EOF; }
 };
 
-//	yields:
-//		0 if for each i in [0,n), X::eq(s1[i],s2[i]) is true; 
-//		else, a negative value if, for some j in [0,n), X::lt(s1[j],s2[j]) is true and
-//			for each i in [0,j) X::eq(s2[i],s2[i]) is true;
-//		else a positive value.
+//  yields:
+//      0 if for each i in [0,n), X::eq(s1[i],s2[i]) is true;
+//      else, a negative value if, for some j in [0,n), X::lt(s1[j],s2[j]) is true and
+//          for each i in [0,j) X::eq(s2[i],s2[i]) is true;
+//      else a positive value.
 constexpr int constexpr_char_traits::compare(const char_type* s1, const char_type* s2, size_t n) noexcept
 {
     for (; n != 0; --n, ++s1, ++s2)
@@ -77,38 +78,38 @@ int main()
     constexpr string_view sv2{"abc", 3}; // ptr, len
     constexpr string_view sv3{"def"}; 	 // ptr
 
-	constexpr const char *s1 = "";
-	constexpr const char *s2 = "abc";
-	
-	static_assert( (sv1 == sv1), "" );
-	
-	static_assert(!(sv1 == sv2), "" );    
-	static_assert( (sv1 != sv2), "" );    
-	static_assert( (sv1 <  sv2), "" );    
-	static_assert( (sv1 <= sv2), "" );    
-	static_assert(!(sv1 >  sv2), "" );    
-	static_assert(!(sv1 >= sv2), "" );    
+    constexpr const char *s1 = "";
+    constexpr const char *s2 = "abc";
 
-	static_assert(!(s1 == sv2), "" );    
-	static_assert( (s1 != sv2), "" );    
-	static_assert( (s1 <  sv2), "" );    
-	static_assert( (s1 <= sv2), "" );    
-	static_assert(!(s1 >  sv2), "" );    
-	static_assert(!(s1 >= sv2), "" );    
+    static_assert( (sv1 == sv1), "" );
 
-	static_assert(!(sv1 == s2), "" );    
-	static_assert( (sv1 != s2), "" );    
-	static_assert( (sv1 <  s2), "" );    
-	static_assert( (sv1 <= s2), "" );    
-	static_assert(!(sv1 >  s2), "" );    
-	static_assert(!(sv1 >= s2), "" );    
+    static_assert(!(sv1 == sv2), "" );
+    static_assert( (sv1 != sv2), "" );
+    static_assert( (sv1 <  sv2), "" );
+    static_assert( (sv1 <= sv2), "" );
+    static_assert(!(sv1 >  sv2), "" );
+    static_assert(!(sv1 >= sv2), "" );
 
-	static_assert( sv1.compare(sv2)  < 0, "" );    
-	static_assert( sv1.compare(sv1) == 0, "" );    
-	static_assert( sv3.compare(sv1)  > 0, "" );    
+    static_assert(!(s1 == sv2), "" );
+    static_assert( (s1 != sv2), "" );
+    static_assert( (s1 <  sv2), "" );
+    static_assert( (s1 <= sv2), "" );
+    static_assert(!(s1 >  sv2), "" );
+    static_assert(!(s1 >= sv2), "" );
 
-	static_assert( sv1.compare(s2)  < 0, "" );    
-	static_assert( sv1.compare(s1) == 0, "" );    
-	static_assert( sv3.compare(s1)  > 0, "" );    
+    static_assert(!(sv1 == s2), "" );
+    static_assert( (sv1 != s2), "" );
+    static_assert( (sv1 <  s2), "" );
+    static_assert( (sv1 <= s2), "" );
+    static_assert(!(sv1 >  s2), "" );
+    static_assert(!(sv1 >= s2), "" );
+
+    static_assert( sv1.compare(sv2)  < 0, "" );
+    static_assert( sv1.compare(sv1) == 0, "" );
+    static_assert( sv3.compare(sv1)  > 0, "" );
+
+    static_assert( sv1.compare(s2)  < 0, "" );
+    static_assert( sv1.compare(s1) == 0, "" );
+    static_assert( sv3.compare(s1)  > 0, "" );
 }
 #endif