Release 1.40.0

[SVN r55802]
2026-01-23 05:32:09 +00:00 · 2009-08-27 16:24:59 +00:00
31 changed files with 659 additions and 2622 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,216 +0,0 @@
-# Copyright 2016 Peter Dimov
-# Copyright 2017 - 2019 James E. King III
-# 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)
-
-#
-# Generic Travis CI build script for boostorg repositories
-# See: https://github.com/boostorg/boost-ci
-#
-# Instructions for customizing this script for your library:
-#
-# 1. Customize the compilers and language levels you want in the 'jobs'.
-# 2. If you have more than include/, src/, test/, example/, examples/, or
-#    tools/ directories, modify your Travis CI project and add the environment
-#    variable DEPINST.  For example if your build uses code in "bench/" and
-#    "fog/" directories, then set DEPINST to the following:
-#        --include bench --include fog
-# 3. If you want to enable Coverity Scan, you need to provide the environment
-#    variables COVERITY_SCAN_TOKEN and COVERITY_SCAN_NOTIFICATION_EMAIL in
-#    your github settings.
-# 4. Enable pull request builds in your boostorg/<library> account.
-#
-# That's it - the scripts will do everything else for you.
-
-dist: xenial
-language: cpp
-
-env:
-  global:
-  # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
-  # - B2_ADDRESS_MODEL=address-model=64,32
-  # - B2_LINK=link=shared,static
-  # - B2_THREADING=threading=multi,single
-    - B2_VARIANT=variant=release
-
-install:
-  - git clone https://github.com/boostorg/boost-ci.git boost-ci
-  - cp -pr boost-ci/ci boost-ci/.codecov.yml .
-  - source ci/travis/install.sh
-
-addons:
-  apt:
-    packages:
-      - binutils-gold
-      - gdb
-      - libc6-dbg
-
-branches:
-  only:
-    - master
-    - develop
-    - /bugfix\/.*/
-    - /feature\/.*/
-    - /fix\/.*/
-    - /pr\/.*/
-
-script:
-  - cd $BOOST_ROOT/libs/$SELF
-  - ci/travis/build.sh
-
-#
-# Default toolsets in Ubuntu
-#
-#       trusty xenial bionic
-#        14.04  16.04  18.04
-#       ------ ------ ------
-# clang    3.4    3.8    6.0
-#   gcc  4.8.2  5.3.1  7.3.0
-#
-
-anchors:
-  clang-38: &clang-38 { apt: { packages: [ "clang-3.8",
-                                           "libstdc++-6-dev" ], sources: [ "llvm-toolchain-xenial-3.8",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  clang-4:  &clang-4  { apt: { packages: [ "clang-4.0",
-                                           "libstdc++-6-dev" ], sources: [ "llvm-toolchain-xenial-4.0",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  clang-5:  &clang-5  { apt: { packages: [ "clang-5.0",
-                                           "libstdc++-7-dev" ], sources: [ "llvm-toolchain-xenial-5.0",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  clang-6:  &clang-6  { apt: { packages: [ "clang-6.0",
-                                           "libc6-dbg",
-                                           "libc++-dev",
-                                           "libstdc++-8-dev" ], sources: [ "llvm-toolchain-xenial-6.0",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  clang-7:  &clang-7  { apt: { packages: [ "clang-7",
-                                           "libc6-dbg",
-                                           "libc++-dev",
-                                           "libstdc++-8-dev" ], sources: [ "llvm-toolchain-xenial-7",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  clang-8:  &clang-8  { apt: { packages: [ "clang-8",
-                                           "libc6-dbg",
-                                           "libc++-dev",
-                                           "libstdc++-8-dev" ], sources: [ "llvm-toolchain-xenial-8",
-                                                                           "ubuntu-toolchain-r-test"   ] } }
-  gcc-48:   &gcc-48   { apt: { packages: [ "g++-4.8"         ]                                           } }
-  gcc-49:   &gcc-49   { apt: { packages: [ "g++-4.9"         ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-5:    &gcc-5    { apt: { packages: [ "g++-5"           ]                                           } }
-  gcc-6:    &gcc-6    { apt: { packages: [ "g++-6"           ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-7:    &gcc-7    { apt: { packages: [ "g++-7"           ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-8:    &gcc-8    { apt: { packages: [ "g++-8"           ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-  gcc-9:    &gcc-9    { apt: { packages: [ "g++-9"           ], sources: [ "ubuntu-toolchain-r-test"   ] } }
-
-jobs:
-  allow_failures:
-    - env:
-      - COPY="all the environment settings from your job"
-
-  include:
-    # libstdc++
-    - { os: "linux", dist: "trusty",  # xenial has libstdc++ from gcc 5.4.0 with newer ABI
-                     env: [ "B2_TOOLSET=gcc-4.8",     "B2_CXXSTD=03,11"    ], addons: *gcc-48    }
-    - { os: "linux", dist: "trusty",  # xenial has libstdc++ from gcc 5.4.0 with newer ABI
-                     env: [ "B2_TOOLSET=gcc-4.9",     "B2_CXXSTD=03,11"    ], addons: *gcc-49    }
-    - { os: "linux", env: [ "B2_TOOLSET=gcc-5",       "B2_CXXSTD=03,11"    ], addons: *gcc-5     }
-    - { os: "linux", env: [ "B2_TOOLSET=gcc-6",       "B2_CXXSTD=11,14"    ], addons: *gcc-6     }
-    - { os: "linux", env: [ "B2_TOOLSET=gcc-7",       "B2_CXXSTD=14,17"    ], addons: *gcc-7     }
-    - { os: "linux", env: [ "B2_TOOLSET=gcc-8",       "B2_CXXSTD=17,2a"    ], addons: *gcc-8     }
-    - { os: "linux", env: [ "B2_TOOLSET=gcc-9",       "B2_CXXSTD=17,2a"    ], addons: *gcc-9     }
-    - { os: "linux", dist: "trusty",  # xenial has libstdc++ from gcc 5.4.0 with newer ABI
-                     env: [ "B2_TOOLSET=clang-3.8",   "B2_CXXSTD=03,11"    ], addons: *clang-38  }
-    - { os: "linux", env: [ "B2_TOOLSET=clang-4.0",   "B2_CXXSTD=11,14"    ], addons: *clang-4   }
-    - { os: "linux", env: [ "B2_TOOLSET=clang-5.0",   "B2_CXXSTD=11,14"    ], addons: *clang-5   }
-    - { os: "linux", env: [ "B2_TOOLSET=clang-6.0",   "B2_CXXSTD=14,17"    ], addons: *clang-6   }
-    - { os: "linux", env: [ "B2_TOOLSET=clang-7",     "B2_CXXSTD=17,2a"    ], addons: *clang-7   }
-    - { os: "linux", env: [ "B2_TOOLSET=clang-8",     "B2_CXXSTD=17,2a"    ], addons: *clang-8   }
-
-    # libc++
-    - { os: "linux", env: [ "B2_TOOLSET=clang-6.0",   "B2_CXXSTD=03,11,14",
-                            "B2_CXXFLAGS=-stdlib=libc++"                   ], addons: *clang-6   }
-    - { os: "osx"  , env: [ "B2_TOOLSET=clang",       "B2_CXXSTD=03,11,17" ]                     }
-
-    # to enable Intel ICC define INTEL_ICC_SERIAL_NUMBER and the following:
-    # - { os: "linux", env: [ "B2_TOOLSET=intel-linux", "B2_CXXSTD=11,14,17" ], addons: *gcc-7,
-    #     script: cd $BOOST_ROOT/libs/$SELF && ci/travis/intelicc.sh                               }
-
-    - os: linux
-      env:
-        - COMMENT=codecov.io
-        - B2_CXXSTD=03,11
-        - B2_TOOLSET=gcc-8
-        - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1"
-      addons: *gcc-8
-      script:
-        - cd $BOOST_ROOT/libs/$SELF
-        - ci/travis/codecov.sh
-
-    - os: linux
-      env:
-        - COMMENT=asan
-        - B2_VARIANT=variant=debug
-        - B2_TOOLSET=gcc-8
-        - B2_CXXSTD=03,11,14
-        - B2_CXXFLAGS="address-sanitizer=norecover"
-        - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1"
-      addons: *gcc-8
-
-    - os: linux
-      env:
-        - COMMENT=tsan
-        - B2_VARIANT=variant=debug
-        - B2_TOOLSET=gcc-8
-        - B2_CXXSTD=03,11,14
-        - B2_CXXFLAGS="thread-sanitizer=norecover"
-        - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1"
-      addons: *gcc-8
-
-    - os: linux
-      env:
-        - COMMENT=ubsan
-        - B2_VARIANT=variant=debug
-        - B2_TOOLSET=gcc-8
-        - B2_CXXSTD=03,11,14
-        - B2_CXXFLAGS="undefined-sanitizer=norecover"
-        - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1"
-        # https://github.com/boostorg/build/issues/451 using the gold linker to work around an issue
-        - B2_LINKFLAGS="linkflags=-fuse-ld=gold"
-        - UBSAN_OPTIONS=print_stacktrace=1
-      addons: *gcc-8
-
-    - os: linux
-      env:
-        - COMMENT=valgrind
-        - B2_TOOLSET=clang-6.0
-        - B2_CXXSTD=03,11,14
-        - B2_DEFINES="define=BOOST_NO_STRESS_TEST=1"
-        - B2_VARIANT=variant=debug
-        - B2_TESTFLAGS=testing.launcher=valgrind
-        - VALGRIND_OPTS=--error-exitcode=1
-      addons: *clang-6
-      script:
-        - cd $BOOST_ROOT/libs/$SELF
-        - ci/travis/valgrind.sh
-
-    # - os: linux
-    #   env:
-    #     - COMMENT=cppcheck
-    #   script:
-    #     - cd $BOOST_ROOT/libs/$SELF
-    #     - ci/travis/cppcheck.sh
-
-    #################### Jobs to run on pushes to master, develop ###################
-
-    # Coverity Scan
-    - os: linux
-      if: (env(COVERITY_SCAN_NOTIFICATION_EMAIL) IS present) AND (branch IN (develop, master)) AND (type IN (cron, push))
-      env:
-        - COMMENT="Coverity Scan"
-        - B2_TOOLSET=clang
-      script:
-        - cd $BOOST_ROOT/libs/$SELF
-        - ci/travis/coverity.sh
-
-notifications:
-  email:
-    false
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,30 @@
-# Copyright 2019 Sam Day
-# 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
 #
-# NOTE: CMake support for Boost.dynamic_bitset is currently experimental at best
-#       and the interface is likely to change in the future
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
+#----------------------------------------------------------------------------
+# This file was automatically generated from the original CMakeLists.txt file
+# Add a variable to hold the headers for the library
+set (lib_headers
+    dynamic_bitset.hpp
+    dynamic_bitset_fwd.hpp
+    dynamic_bitset
+)

-cmake_minimum_required(VERSION 3.5)
-project(BoostDynamicBitset LANGUAGES CXX)
+# Add a library target to the build system
+boost_library_project(
+  dynamic_bitset
+  #  SRCDIRS 
+  TESTDIRS  test
+  HEADERS ${lib_headers}
+  #  DOCDIRS 
+  DESCRIPTION  "A runtime-sized version of std::bitset"
+  MODULARIZED
+  AUTHORS  "Jeremy Siek <jeremy.siek -at- gmail.com>"
+           "Chuck Allison"
+  #  MAINTAINERS 
+)

-add_library(boost_dynamic_bitset INTERFACE)
-add_library(Boost::dynamic_bitset ALIAS boost_dynamic_bitset)

-target_include_directories(boost_dynamic_bitset INTERFACE include)
-
-target_link_libraries(boost_dynamic_bitset
-        INTERFACE
-        Boost::assert
-        Boost::config
-        Boost::core
-        Boost::integer
-        Boost::move
-        Boost::static_assert
-        Boost::throw_exception
-        )
--- a/11
+++ b/11
@@ -1,11 +0,0 @@
-#  Boost.DynamicBitset Library Jamfile
-#
-#  Copyright (c) 2018 James E. King III
-#
-#  Use, modification, and distribution are subject to 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)
-
-# please order by name to ease maintenance
-build-project example ;
-build-project test ;
--- a/Jamfile.v2
+++ b/Jamfile.v2
@@ -0,0 +1,14 @@
+#
+#              Copyright Vladimir Prus 2004
+#
+# 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)
+
+test-suite dynamic_bitset :
+
+    [ run dyn_bitset_unit_tests1.cpp ]
+    [ run dyn_bitset_unit_tests2.cpp ]
+    [ run dyn_bitset_unit_tests3.cpp ]
+    [ run dyn_bitset_unit_tests4.cpp ]
+    ;
--- a/23
+++ b/23
@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--- a/README.md
+++ b/README.md
@@ -1,34 +0,0 @@
-DynamicBitset, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), is similar to std::bitset however the size is specified at run-time instead of at compile-time.
-
-### License
-
-Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
-
-### Properties
-
-* C++03
-* Header-only
-
-### Build Status
-
-Branch          | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests |
-:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- |
-[`master`](https://github.com/boostorg/dynamic_bitset/tree/master) | [![Build Status](https://travis-ci.org/boostorg/dynamic_bitset.svg?branch=master)](https://travis-ci.org/boostorg/dynamic_bitset) | [![Build status](https://ci.appveyor.com/api/projects/status/keyn57y5d3sl1gw5/branch/master?svg=true)](https://ci.appveyor.com/project/jeking3/dynamic_bitset-jv17p/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/16167/badge.svg)](https://scan.coverity.com/projects/boostorg-dynamic_bitset) | [![codecov](https://codecov.io/gh/boostorg/dynamic_bitset/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/dynamic_bitset/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/dynamic_bitset.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/dynamic_bitset.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/dynamic_bitset.html)
-[`develop`](https://github.com/boostorg/dynamic_bitset/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/dynamic_bitset.svg?branch=develop)](https://travis-ci.org/boostorg/dynamic_bitset) | [![Build status](https://ci.appveyor.com/api/projects/status/keyn57y5d3sl1gw5/branch/develop?svg=true)](https://ci.appveyor.com/project/jeking3/dynamic_bitset-jv17p/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/16167/badge.svg)](https://scan.coverity.com/projects/boostorg-dynamic_bitset) | [![codecov](https://codecov.io/gh/boostorg/dynamic_bitset/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/dynamic_bitset/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/dynamic_bitset.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/dynamic_bitset.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/dynamic_bitset.html)
-
-### Directories
-
-| Name        | Purpose                        |
-| ----------- | ------------------------------ |
-| `example`   | examples                       |
-| `doc`       | documentation                  |
-| `include`   | headers                        |
-| `test`      | unit tests                     |
-
-### More information
-
-* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-dynamic_bitset)
-* [Report bugs](https://github.com/boostorg/dynamic_bitset/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well.
-* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt).
-* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[dynamic_bitset]` tag at the beginning of the subject line.
-
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,147 +0,0 @@
-# Copyright 2016, 2017 Peter Dimov
-# Copyright (C) 2017 - 2019 James E. King III
-# 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)
-
-#
-# Generic Appveyor build script for boostorg repositories
-# See: https://github.com/boostorg/boost-ci/
-#
-# Instructions for customizing this script for your library:
-#
-# 1. Customize the compilers and language levels you want.
-# 2. If you have more than include/, src/, test/, example/, examples/,
-#    benchmark/ or tools/ directories, set the environment variable DEPINST.
-#    For example if your build uses code in "bench/" and "fog/" directories:
-#      - DEPINST: --include bench --include fog
-# 3. Enable pull request builds in your boostorg/<library> account.
-#
-# That's it - the script will do everything else for you.
-#
-
-version: 1.0.{build}-{branch}
-
-shallow_clone: true
-
-branches:
-  only:
-    - master
-    - develop
-    - /bugfix\/.*/
-    - /feature\/.*/
-    - /fix\/.*/
-    - /pr\/.*/
-
-matrix:
-  # Adding MAYFAIL to any matrix job allows it to fail but the build stays green:
-  allow_failures:
-    - MAYFAIL: true
-
-environment:
-  global:
-    # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
-    # to use the default for a given environment, comment it out; recommend you build debug and release however:
-    # on Windows it is important to exercise all the possibilities, especially shared vs static, however most
-    # libraries that care about this exercise it in their Jamfiles...
-    # B2_ADDRESS_MODEL: address-model=64,32
-    # B2_LINK: link=shared,static
-    # B2_THREADING: threading=multi,single
-    B2_VARIANT: variant=release
-
-  matrix:
-    - FLAVOR: Visual Studio 2019
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXFLAGS: cxxflags=-permissive-
-      B2_CXXSTD: latest # 2a
-      B2_TOOLSET: msvc-14.2
-
-    - FLAVOR: Visual Studio 2017 C++2a Strict
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXFLAGS: cxxflags=-permissive-
-      B2_CXXSTD: latest # 2a
-      B2_TOOLSET: msvc-14.1
-
-    - FLAVOR: Visual Studio 2017 C++17
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 17
-      B2_TOOLSET: msvc-14.1
-      B2_VARIANT: variant=debug
-
-    - FLAVOR: Visual Studio 2017 C++14 (Default)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64,32
-      B2_TOOLSET: msvc-14.1
-
-    - FLAVOR: clang-cl
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 11
-      B2_TOOLSET: clang-win
-
-    - FLAVOR: Visual Studio 2015 C++14 (Default)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_ADDRESS_MODEL: address-model=64,32
-      B2_TOOLSET: msvc-14.0
-      B2_VARIANT: variant=debug
-
-    - FLAVOR: Visual Studio 2010, 2012, 2013
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_TOOLSET: msvc-10.0,msvc-11.0,msvc-12.0
-
-    - FLAVOR: cygwin (32-bit)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ADDPATH: C:\cygwin\bin;
-      B2_ADDRESS_MODEL: address-model=32
-      B2_CXXSTD: 03,11
-      # https://github.com/boostorg/test/issues/144
-      B2_DEFINES: define=_POSIX_C_SOURCE=200112L
-      B2_THREADING: threadapi=pthread
-      B2_TOOLSET: gcc
-      B2_VARIANT: variant=debug
-
-    - FLAVOR: cygwin (64-bit)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ADDPATH: C:\cygwin64\bin;
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 11,17
-      # https://github.com/boostorg/test/issues/144
-      B2_DEFINES: define=_POSIX_C_SOURCE=200112L define=__USE_ISOC99
-      B2_THREADING: threadapi=pthread
-      B2_TOOLSET: gcc
-
-    - FLAVOR: mingw32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: i686
-      B2_ADDRESS_MODEL: address-model=32
-      B2_CXXSTD: 03,11
-      SCRIPT: ci\appveyor\mingw.bat
-      B2_VARIANT: variant=debug
-
-    - FLAVOR: mingw64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: x86_64
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 11,17
-      B2_DEFINES: define=__USE_ISOC99
-      SCRIPT: ci\appveyor\mingw.bat
-
-install:
-  - set SELF=%APPVEYOR_PROJECT_NAME:-=_%
-  - git clone https://github.com/boostorg/boost-ci.git C:\boost-ci
-  - xcopy /s /e /q /i C:\boost-ci\ci .\ci
-  - ci\appveyor\install.bat
-
-build: off
-
-test_script:
-  - set SELF=%APPVEYOR_PROJECT_NAME:-=_%
-  - PATH=%ADDPATH%%PATH%
-  # The definition of B2_TOOLCXX omits B2_CXXSTD= if it was not defined above
-  - IF NOT DEFINED B2_CXXSTD (SET B2_TOOLCXX=toolset=%B2_TOOLSET%) ELSE (SET B2_TOOLCXX=toolset=%B2_TOOLSET% cxxstd=%B2_CXXSTD%)
-  # Echo the complete build command to the build log
-  - IF NOT DEFINED SCRIPT                         (ECHO b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
-  # Now go build...
-  - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
--- a/test/bitset_test.hpp
+++ b/test/bitset_test.hpp
--- a/doc/readme
+++ b/doc/readme
@@ -1 +0,0 @@
-The documentation for the dynamic_bitset library is the top-level index.html file.
--- a/test/dyn_bitset_unit_tests1.cpp
+++ b/test/dyn_bitset_unit_tests1.cpp
@@ -1,11 +1,6 @@
 // -----------------------------------------------------------
 //              Copyright (c) 2001 Jeremy Siek
 //           Copyright (c) 2003-2006 Gennaro Prota
-//             Copyright (c) 2014 Ahmed Charles
-//            Copyright (c) 2014 Riccardo Marcangelo 
-//
-// Copyright (c) 2014 Glen Joseph Fernandes
-// (glenjofe@gmail.com)
 //
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -14,38 +9,11 @@
 // -----------------------------------------------------------

 #include "bitset_test.hpp"
-#include <boost/dynamic_bitset/dynamic_bitset.hpp>
-#include <boost/limits.hpp>
-#include <boost/config.hpp>
+#include "boost/dynamic_bitset/dynamic_bitset.hpp"
+#include "boost/limits.hpp"
+#include "boost/config.hpp"

-#include <boost/config/workaround.hpp>
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-#include <cstdlib>
-
-template<class T>
-class minimal_allocator {
-public:
-    typedef T value_type;
-
-    minimal_allocator() {}
-
-    template <typename U>
-    minimal_allocator(const minimal_allocator<U>&) {}
-
-    T* allocate(std::size_t n) {
-        void* p = std::malloc(sizeof(T) * n);
-        if (!p) {
-            throw std::bad_alloc();
-        }
-        return static_cast<T*>(p);
-    }
-
-    void deallocate(T* p, std::size_t) {
-        std::free(p);
-    }
-};
-#endif
+#include "boost/detail/workaround.hpp"

 #define BOOST_BITSET_TEST_COUNT(x) (sizeof(x)/sizeof(x[0]))

@@ -103,8 +71,8 @@ void run_numeric_ctor_tests( BOOST_EXPLICIT_TEMPLATE_TYPE(Tests)
    };

    const T numbers[] = {
-              T(-1), T(-3), T(-8), T(-15), T(mi/2), T(mi),
-        T(0), T(1),  T(3),  T(8),  T(15),  T(ma/2), T(ma)
+           T(-1), T(-3), T(-8), T(-15), mi/2, mi,
+        0,    1,     3,     8,     15,  ma/2, ma
    };

    for (std::size_t s = 0; s < BOOST_BITSET_TEST_COUNT(sizes); ++s) {
@@ -149,6 +117,9 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
  //=====================================================================
  // Test construction from unsigned long
  {
+    typedef typename bitset_type::size_type size_type;
+
+
    // NOTE:
    //
    // 1. keep this in sync with the numeric types supported
@@ -269,70 +240,29 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
    Tests::copy_constructor(b);
  }
  //=====================================================================
-  // Test copy assignment operator
+  // Test assignment operator
  {
    bitset_type a, b;
-    Tests::copy_assignment_operator(a, b);
+    Tests::assignment_operator(a, b);
  }
  {
    bitset_type a(std::string("1")), b(std::string("0"));
-    Tests::copy_assignment_operator(a, b);
+    Tests::assignment_operator(a, b);
  }
  {
    bitset_type a(long_string), b(long_string);
-    Tests::copy_assignment_operator(a, b);
+    Tests::assignment_operator(a, b);
  }
  {
    bitset_type a;
    bitset_type b(long_string); // b greater than a, a empty
-    Tests::copy_assignment_operator(a, b);
+    Tests::assignment_operator(a, b);
  }
  {
    bitset_type a(std::string("0"));
    bitset_type b(long_string); // b greater than a
-    Tests::copy_assignment_operator(a, b);
+    Tests::assignment_operator(a, b);
  }
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-  //=====================================================================
-  // Test move constructor
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::move_constructor(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::move_constructor(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::move_constructor(b);
-  }
-  //=====================================================================
-  // Test move assignment operator
-  {
-    bitset_type a, b;
-    Tests::move_assignment_operator(a, b);
-  }
-  {
-    bitset_type a(std::string("1")), b(std::string("0"));
-    Tests::move_assignment_operator(a, b);
-  }
-  {
-    bitset_type a(long_string), b(long_string);
-    Tests::move_assignment_operator(a, b);
-  }
-  {
-    bitset_type a;
-    bitset_type b(long_string); // b greater than a, a empty
-    Tests::move_assignment_operator(a, b);
-  }
-  {
-    bitset_type a(std::string("0"));
-    bitset_type b(long_string); // b greater than a
-    Tests::move_assignment_operator(a, b);
-  }
-#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
  //=====================================================================
  // Test swap
  {
@@ -385,25 +315,6 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
    Tests::clear(a);
  }
  //=====================================================================
-  // Test pop back 
-  {
-    boost::dynamic_bitset<Block> a(std::string("01"));
-    Tests::pop_back(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("10"));
-    Tests::pop_back(a);
-  }
-  {
-    const int size_to_fill_all_blocks = 4 * bits_per_block;
-    boost::dynamic_bitset<Block> a(size_to_fill_all_blocks, 255ul);
-    Tests::pop_back(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(long_string);
-    Tests::pop_back(a);
-  }
-  //=====================================================================
  // Test append bit
  {
    boost::dynamic_bitset<Block> a;
@@ -509,23 +420,10 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
      bit_vec[i] = long_string[n - 1 - i] == '0' ? 0 : 1;
    Tests::operator_bracket(b, bit_vec);
  }
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-  {
-     typedef boost::dynamic_bitset<Block,
-       minimal_allocator<Block> > Bitset;
-     Bitset b;
-     bitset_test<Bitset>::max_size(b);
-  }
-#endif
-  // Test copy-initialize with default constructor
-  {
-    boost::dynamic_bitset<Block> b[1] = {};
-    (void)b;
-  }
 }

 int
-main()
+test_main(int, char*[])
 {
  run_test_cases<unsigned char>();
  run_test_cases<unsigned short>();
@@ -535,5 +433,5 @@ main()
  run_test_cases< ::boost::ulong_long_type>();
 # endif

-  return boost::report_errors();
+  return 0;
 }
--- a/test/dyn_bitset_unit_tests2.cpp
+++ b/test/dyn_bitset_unit_tests2.cpp
@@ -1,8 +1,6 @@
 // -----------------------------------------------------------
 //              Copyright (c) 2001 Jeremy Siek
 //           Copyright (c) 2003-2006 Gennaro Prota
-//             Copyright (c) 2014 Ahmed Charles
-//             Copyright (c) 2018 Evgeny Shulgin
 //
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -11,8 +9,8 @@
 // -----------------------------------------------------------

 #include "bitset_test.hpp"
-#include <boost/dynamic_bitset/dynamic_bitset.hpp>
-#include <boost/config.hpp>
+#include "boost/dynamic_bitset/dynamic_bitset.hpp"
+#include "boost/config.hpp"


 template <typename Block>
@@ -196,51 +194,14 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
  { // case pos >= b.size()
    boost::dynamic_bitset<Block> b;
    Tests::set_one(b, 0, true);
-    Tests::set_one(b, 0, false);
  }
  { // case pos < b.size()
    boost::dynamic_bitset<Block> b(std::string("0"));
    Tests::set_one(b, 0, true);
-    Tests::set_one(b, 0, false);
  }
  { // case pos == b.size() / 2
    boost::dynamic_bitset<Block> b(long_string);
    Tests::set_one(b, long_string.size()/2, true);
-    Tests::set_one(b, long_string.size()/2, false);
-  }
-  //=====================================================================
-  // Test b.set(pos, len)
-  { // case size is 1
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::set_segment(b, 0, 1, true);
-    Tests::set_segment(b, 0, 1, false);
-  }
-  { // case fill the whole set
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::set_segment(b, 0, b.size(), true);
-    Tests::set_segment(b, 0, b.size(), false);
-  }
-  { // case pos = size / 4, len = size / 2
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::set_segment(b, b.size() / 4, b.size() / 2, true);
-    Tests::set_segment(b, b.size() / 4, b.size() / 2, false);
-  }
-  { // case pos = block_size / 2, len = size - block_size
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::set_segment(b, boost::dynamic_bitset<Block>::bits_per_block / 2,
-            b.size() - boost::dynamic_bitset<Block>::bits_per_block, true);
-    Tests::set_segment(b, boost::dynamic_bitset<Block>::bits_per_block / 2,
-            b.size() - boost::dynamic_bitset<Block>::bits_per_block, false);
-  }
-  { // case pos = 1, len = size - 2
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::set_segment(b, 1, b.size() - 2, true);
-    Tests::set_segment(b, 1, b.size() - 2, false);
-  }
-  { // case pos = 3, len = 7
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::set_segment(b, 3, 7, true);
-    Tests::set_segment(b, 3, 7, false);
  }
  //=====================================================================
  // Test b.reset()
@@ -271,33 +232,6 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
    Tests::reset_one(b, long_string.size()/2);
  }
  //=====================================================================
-  // Test b.reset(pos, len)
-  { // case size is 1
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::reset_segment(b, 0, 1);
-  }
-  { // case fill the whole set
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::reset_segment(b, 0, b.size());
-  }
-  { // case pos = size / 4, len = size / 2
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::reset_segment(b, b.size() / 4, b.size() / 2);
-  }
-  { // case pos = block_size / 2, len = size - block_size
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::reset_segment(b, boost::dynamic_bitset<Block>::bits_per_block / 2,
-            b.size() - boost::dynamic_bitset<Block>::bits_per_block);
-  }
-  { // case pos = 1, len = size - 2
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::reset_segment(b, 1, b.size() - 2);
-  }
-  { // case pos = 3, len = 7
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::reset_segment(b, 3, 7);
-  }
-  //=====================================================================
  // Test ~b
  {
    boost::dynamic_bitset<Block> b;
@@ -339,37 +273,10 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
    boost::dynamic_bitset<Block> b(long_string);
    Tests::flip_one(b, long_string.size()/2);
  }
-  //=====================================================================
-  // Test b.flip(pos, len)
-  { // case size is 1
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::flip_segment(b, 0, 1);
-  }
-  { // case fill the whole set
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::flip_segment(b, 0, b.size());
-  }
-  { // case pos = size / 4, len = size / 2
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::flip_segment(b, b.size() / 4, b.size() / 2);
-  }
-  { // case pos = block_size / 2, len = size - block_size
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::flip_segment(b, boost::dynamic_bitset<Block>::bits_per_block / 2,
-            b.size() - boost::dynamic_bitset<Block>::bits_per_block);
-  }
-  { // case pos = 1, len = size - 2
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::flip_segment(b, 1, b.size() - 2);
-  }
-  { // case pos = 3, len = 7
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::flip_segment(b, 3, 7);
-  }
 }

 int
-main()
+test_main(int, char*[])
 {
  run_test_cases<unsigned char>();
  run_test_cases<unsigned short>();
@@ -379,5 +286,5 @@ main()
  run_test_cases< ::boost::ulong_long_type>();
 # endif

-  return boost::report_errors();
+  return 0;
 }
--- a/test/dyn_bitset_unit_tests3.cpp
+++ b/test/dyn_bitset_unit_tests3.cpp
@@ -1,8 +1,6 @@
 // -----------------------------------------------------------
 //              Copyright (c) 2001 Jeremy Siek
 //           Copyright (c) 2003-2006 Gennaro Prota
-//             Copyright (c) 2014 Ahmed Charles
-//          Copyright (c) 2014 Riccardo Marcangelo
 //
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -12,9 +10,10 @@

 #include <assert.h>
 #include "bitset_test.hpp"
-#include <boost/dynamic_bitset/dynamic_bitset.hpp>
-#include <boost/limits.hpp>
-#include <boost/config.hpp>
+#include "boost/dynamic_bitset/dynamic_bitset.hpp"
+#include "boost/limits.hpp"
+#include "boost/config.hpp"
+

 template <typename Block>
 void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
@@ -122,103 +121,32 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
    Tests::size(b);
  }
  //=====================================================================
-  // Test b.capacity()
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::capacity_test_one(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(100);
-    Tests::capacity_test_two(b);
-  }
-  //=====================================================================
-  // Test b.reserve()
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::reserve_test_one(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(100);
-    Tests::reserve_test_two(b);
-  }
-  //=====================================================================
-  // Test b.shrink_to_fit()
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::shrink_to_fit_test_one(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(100);
-    Tests::shrink_to_fit_test_two(b);
-  }
-  //=====================================================================
-  // Test b.all()
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::all(b);
-    Tests::all(~b);
-    Tests::all(b.set());
-    Tests::all(b.reset());
-  }
-  {
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::all(b);
-    Tests::all(~b);
-    Tests::all(b.set());
-    Tests::all(b.reset());
-  }
-  {
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::all(b);
-    Tests::all(~b);
-    Tests::all(b.set());
-    Tests::all(b.reset());
-  }
-  //=====================================================================
  // Test b.any()
  {
    boost::dynamic_bitset<Block> b;
    Tests::any(b);
-    Tests::any(~b);
-    Tests::any(b.set());
-    Tests::any(b.reset());
  }
  {
    boost::dynamic_bitset<Block> b(std::string("0"));
    Tests::any(b);
-    Tests::any(~b);
-    Tests::any(b.set());
-    Tests::any(b.reset());
  }
  {
    boost::dynamic_bitset<Block> b(long_string);
    Tests::any(b);
-    Tests::any(~b);
-    Tests::any(b.set());
-    Tests::any(b.reset());
  }
  //=====================================================================
  // Test b.none()
  {
    boost::dynamic_bitset<Block> b;
    Tests::none(b);
-    Tests::none(~b);
-    Tests::none(b.set());
-    Tests::none(b.reset());
  }
  {
    boost::dynamic_bitset<Block> b(std::string("0"));
    Tests::none(b);
-    Tests::none(~b);
-    Tests::none(b.set());
-    Tests::none(b.reset());
  }
  {
    boost::dynamic_bitset<Block> b(long_string);
    Tests::none(b);
-    Tests::none(~b);
-    Tests::none(b.set());
-    Tests::none(b.reset());
  }
  //=====================================================================
  // Test a.is_subset_of(b)
@@ -476,14 +404,6 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
    boost::dynamic_bitset<Block> a(std::string("10")), b(std::string("11"));
    Tests::operator_less_than(a, b);
  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("101")), b(std::string("11"));
-    Tests::operator_less_than(a, b);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("10")), b(std::string("111"));
-    Tests::operator_less_than(a, b);
-  }
  {
    boost::dynamic_bitset<Block> a(long_string), b(long_string);
    Tests::operator_less_than(a, b);
@@ -498,7 +418,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
    b[long_string.size()/2].flip();
    Tests::operator_less_than(a, b);
  }
-  // check for consistency with ulong behaviour when the sizes are equal
+  // check for consistency with ulong behaviour
  {
    boost::dynamic_bitset<Block> a(3, 4ul), b(3, 5ul);
    assert(a < b);
@@ -511,31 +431,6 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
    boost::dynamic_bitset<Block> a(3, 5ul), b(3, 4ul);
    assert(!(a < b));
  }
-  // when the sizes are not equal lexicographic compare does not necessarily correspond to ulong behavior
-  {
-    boost::dynamic_bitset<Block> a(4, 4ul), b(3, 5ul);
-    assert(a < b);
-  }
-  {
-    boost::dynamic_bitset<Block> a(3, 4ul), b(4, 5ul);
-    assert(!(a < b));
-  }
-  {
-    boost::dynamic_bitset<Block> a(4, 4ul), b(3, 4ul);
-    assert(a < b);
-  }
-  {
-    boost::dynamic_bitset<Block> a(3, 4ul), b(4, 4ul);
-    assert(!(a < b));
-  }
-  {
-    boost::dynamic_bitset<Block> a(4, 5ul), b(3, 4ul);
-    assert(a < b);
-  }
-  {
-    boost::dynamic_bitset<Block> a(3, 5ul), b(4, 4ul);
-    assert(!(a < b));
-  }
  //=====================================================================
  // Test operator<=
  {
@@ -674,23 +569,6 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
    Tests::test_bit(b, long_string.size()/2);
  }
  //=====================================================================
-  // Test b.test_set(pos)
-  { // case pos >= b.size()
-    boost::dynamic_bitset<Block> b;
-    Tests::test_set_bit(b, 0, true);
-    Tests::test_set_bit(b, 0, false);
-  }
-  { // case pos < b.size()
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::test_set_bit(b, 0, true);
-    Tests::test_set_bit(b, 0, false);
-  }
-  { // case pos == b.size() / 2
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::test_set_bit(b, long_string.size() / 2, true);
-    Tests::test_set_bit(b, long_string.size() / 2, false);
-  }
-  //=====================================================================
  // Test b << pos
  { // case pos == 0
    std::size_t pos = 0;
@@ -798,9 +676,8 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
  }
 }

-
 int
-main()
+test_main(int, char*[])
 {
  run_test_cases<unsigned char>();
  run_test_cases<unsigned short>();
@@ -810,5 +687,5 @@ main()
  run_test_cases< ::boost::ulong_long_type>();
 # endif

-  return boost::report_errors();
+  return 0;
 }
--- a/test/dyn_bitset_unit_tests4.cpp
+++ b/test/dyn_bitset_unit_tests4.cpp
@@ -14,14 +14,14 @@
 #include <stdexcept> // for std::logic_error
 #include <assert.h>

-#include <boost/config.hpp>
+#include "boost/config.hpp"
 #if !defined (BOOST_NO_STRINGSTREAM)
 # include <sstream>
 #endif

 #include "bitset_test.hpp"
-#include <boost/dynamic_bitset/dynamic_bitset.hpp>
-#include <boost/config/workaround.hpp>
+#include "boost/dynamic_bitset/dynamic_bitset.hpp"
+#include "boost/detail/workaround.hpp"


 // Codewarrior 8.3 for Win fails without this.
@@ -125,13 +125,13 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
            }
            {
              // test 1a - file stream
-              scoped_temp_file stf;
              bitset_type b(strings[si]);
-              std::ofstream file(stf.path().string().c_str(), std::ios::trunc);
+              std::ofstream file(test_file_name(), std::ios::trunc);
              file.width(w);
              file.fill(fill_chars[ci]);
              file.exceptions(masks[mi]);
-              Tests::stream_inserter(b, file, stf.path().string().c_str());
+              Tests::stream_inserter(b, file, test_file_name());
+
            }
            {
              //NOTE: there are NO string stream tests
@@ -139,13 +139,12 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
 #if !defined (BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS)
            {
              // test 1b - wide file stream
-              scoped_temp_file stf;
              bitset_type b(strings[si]);
-              std::wofstream file(stf.path().string().c_str());
+              std::wofstream file(test_file_name());
              file.width(w);
              file.fill(fill_chars[ci]);
              file.exceptions(masks[mi]);
-              Tests::stream_inserter(b, file, stf.path().string().c_str()); 
+              Tests::stream_inserter(b, file, test_file_name());
            }
 #endif
          }
@@ -177,11 +176,11 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )


  std::ios::iostate masks[] = {
-                                std::ios::goodbit,
-                                std::ios::eofbit,
-                                std::ios::failbit,
-                                std::ios::eofbit | std::ios::failbit
-                              };
+                                  std::ios::goodbit,
+                                  std::ios::eofbit,
+                                  std::ios::failbit,
+                                  std::ios::eofbit | std::ios::failbit
+                                   };

  const std::string spaces = "\t\n "; //"\t\n\v\f ";

@@ -191,7 +190,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
                  //       (in Tests::stream_extractor instantiation)


-#if !(defined BOOST_BORLANDC     \
+#if !(defined __BORLANDC__     \
      && BOOST_WORKAROUND(BOOST_RWSTD_VER, BOOST_TESTED_AT(0x20101)))
                                        // Borland 5.5.1 with RW library crashes
            // empty string
@@ -258,14 +257,13 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
        }
        // test 1a - (narrow) file stream
        {
-          scoped_temp_file stf;
          bitset_type b(1, 255ul);
          {
-            std::ofstream f(stf.path().string().c_str());
+            std::ofstream f(test_file_name());
            f << strings[si];
          }

-          std::ifstream f(stf.path().string().c_str());
+          std::ifstream f(test_file_name());
          f.width(w);
          f.exceptions(masks[mi]);
          Tests::stream_extractor(b, f, strings[si]);
@@ -284,15 +282,14 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
 #if !defined(BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS)
        // test 1b - wchar_t file stream
        {
-          scoped_temp_file stf;
          std::wstring wstr = widen_string(strings[si]);
          bitset_type b(1, 255ul);
          {
-            std::basic_ofstream<wchar_t> of(stf.path().string().c_str());
+            std::basic_ofstream<wchar_t> of(test_file_name());
            of << wstr;
          }

-          std::basic_ifstream<wchar_t> f(stf.path().string().c_str());
+          std::basic_ifstream<wchar_t> f(test_file_name());
          f.width(w);
          f.exceptions(masks[mi]);
          Tests::stream_extractor(b, f, wstr);
@@ -324,7 +321,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )


 int
-main()
+test_main(int, char*[])
 {
  run_test_cases<unsigned char>();
  run_test_cases<unsigned short>();
@@ -334,5 +331,5 @@ main()
  run_test_cases< ::boost::ulong_long_type>();
 # endif

-  return boost::report_errors();
+  return 0;
 }
--- a/dynamic_bitset.html
+++ b/dynamic_bitset.html
@@ -6,9 +6,6 @@
 <!--
                     Copyright (c) 2001 Jeremy Siek
              Copyright (c) 2003-2004, 2008 Gennaro Prota
-                    Copyright (c) 2014 Ahmed Charles
-                 Copyright (c) 2014 Riccardo Marcangelo
-                    Copyright (c) 2018 Evgeny Shulgin

       Distributed under the Boost Software License, Version 1.0.
          (See accompanying file LICENSE_1_0.txt or copy at
@@ -91,7 +88,7 @@ constructor of the <tt>dynamic_bitset</tt>.</p>

 <p>The <tt>dynamic_bitset</tt> class is nearly identical to the
 <a href=
-"https://boost.org/sgi/stl/bitset.html"><tt>std::bitset</tt></a>
+"http://www.sgi.com/tech/stl/bitset.html"><tt>std::bitset</tt></a>
 class. The difference is that the size of the
 <tt>dynamic_bitset</tt> (the number of bits) is specified at
 run-time during the construction of a <tt>dynamic_bitset</tt>
@@ -144,11 +141,8 @@ public:

    typedef bool <a href="#const_reference">const_reference</a>;

-    <a href=
-"#cons0">dynamic_bitset</a>();
-
    explicit <a href=
-"#cons1">dynamic_bitset</a>(const Allocator&amp; alloc);
+"#cons1">dynamic_bitset</a>(const Allocator&amp; alloc = Allocator());

    explicit <a href=
 "#cons2">dynamic_bitset</a>(size_type num_bits, unsigned long value = 0,
@@ -169,23 +163,16 @@ public:
    <a href=
 "#cons5">dynamic_bitset</a>(const dynamic_bitset&amp; b);

-    <a href=
-"#move-cons">dynamic_bitset</a>(dynamic_bitset&amp;&amp; b);
-
    void <a href="#swap">swap</a>(dynamic_bitset&amp; b);

    dynamic_bitset&amp; <a href=
 "#assign">operator=</a>(const dynamic_bitset&amp; b);

-    dynamic_bitset&amp; <a href=
-"#move-assign">operator=</a>(dynamic_bitset&amp;&amp; b);
-
    allocator_type <a href="#get_allocator">get_allocator()</a> const;

    void <a href=
 "#resize">resize</a>(size_type num_bits, bool value = false);
    void <a href="#clear">clear</a>();
-    void <a href="#pop_back">pop_back</a>();
    void <a href="#push_back">push_back</a>(bool bit);
    void <a href="#append1">append</a>(Block block);

@@ -201,39 +188,30 @@ public:
    dynamic_bitset <a href="#op-sl">operator&lt;&lt;</a>(size_type n) const;
    dynamic_bitset <a href="#op-sr">operator&gt;&gt;</a>(size_type n) const;

-    dynamic_bitset&amp; <a href="#set3">set</a>(size_type n, size_type len, bool val);
    dynamic_bitset&amp; <a href="#set2">set</a>(size_type n, bool val = true);
    dynamic_bitset&amp; <a href="#set1">set</a>();
-    dynamic_bitset&amp; <a href="#reset3">reset</a>(size_type n, size_type len);
    dynamic_bitset&amp; <a href="#reset2">reset</a>(size_type n);
    dynamic_bitset&amp; <a href="#reset1">reset</a>();
-    dynamic_bitset&amp; <a href="#flip3">flip</a>(size_type n, size_type len);
    dynamic_bitset&amp; <a href="#flip2">flip</a>(size_type n);
    dynamic_bitset&amp; <a href="#flip1">flip</a>();
    bool <a href="#test">test</a>(size_type n) const;
-    bool <a href="#test">test_set</a>(size_type n, bool val = true);
-    bool <a href="#all">all</a>() const;
    bool <a href="#any">any</a>() const;
    bool <a href="#none">none</a>() const;
    dynamic_bitset <a href="#op-not">operator~</a>() const;
-    size_type <a href="#count">count</a>() const noexcept;
+    size_type <a href="#count">count</a>() const;

    reference <a href="#bracket">operator[]</a>(size_type pos);
    bool <a href="#const-bracket">operator[]</a>(size_type pos) const;

    unsigned long <a href="#to_ulong">to_ulong</a>() const;

-    size_type <a href="#size">size</a>() const noexcept;
-    size_type <a href="#num_blocks">num_blocks</a>() const noexcept;
-    size_type <a href="#max_size">max_size</a>() const noexcept;
-    bool <a href="#empty">empty</a>() const noexcept;
-    size_type <a href="#capacity">capacity</a>() const noexcept;
-    void <a href="#reserve">reserve</a>(size_type num_bits);
-    void <a href="#shrink_to_fit">shrink_to_fit</a>();
+    size_type <a href="#size">size</a>() const;
+    size_type <a href="#num_blocks">num_blocks</a>() const;
+    size_type <a href="#max_size">max_size</a>() const;
+    bool <a href="#empty">empty</a>() const;

    bool <a href="#is_subset_of">is_subset_of</a>(const dynamic_bitset&amp; a) const;
    bool <a href="#is_proper_subset_of">is_proper_subset_of</a>(const dynamic_bitset&amp; a) const;
-    bool <a href="#intersects">intersects</a>(const dynamic_bitset&amp; a) const;

    size_type <a href="#find_first">find_first</a>() const;
    size_type <a href="#find_next">find_next</a>(size_type pos) const;
@@ -343,7 +321,7 @@ input/output and some bitwise operations).
 <h3><a id="rationale">Rationale</a></h3>
 <p>
 <tt>dynamic_bitset</tt> is not a <a href=
-"https://boost.org/sgi/stl/Container.html">Container</a> and
+"http://www.sgi.com/tech/stl/Container.html">Container</a> and
 does not provide iterators for the following reason:
 </p>

@@ -358,7 +336,7 @@ people try to use iterators from <tt>std::vector&lt;bool&gt;</tt>
 with a Standard algorithm such as <tt>std::search</tt>. The
 <tt>std::search</tt> requirements say that the iterator must be a
 <a href=
-"https://boost.org/sgi/stl/ForwardIterator.html">Forward
+"http://www.sgi.com/tech/stl/ForwardIterator.html">Forward
 Iterator</a>, but the <tt>std::vector&lt;bool&gt;::iterator</tt>
 does not meet this requirement because of the proxy reference.
 Depending on the implementation, they may or not be a compile
@@ -370,14 +348,14 @@ by not pretending to be a container.</li>

 <p>Some people prefer the name "toggle" to "flip". The name
 "flip" was chosen because that is the name used in <a href=
-"https://boost.org/sgi/stl/bitset.html"><tt>std::bitset</tt></a>.
+"http://www.sgi.com/tech/stl/bitset.html"><tt>std::bitset</tt></a>.
 In fact, most of the function names for <tt>dynamic_bitset</tt>
 were chosen for this reason.</p>

 <p><tt>dynamic_bitset</tt> does not throw exceptions when a
 precondition is violated (as is done in <tt>std::bitset</tt>).
 Instead <tt>assert</tt> is used. See the guidelines for <a href=
-"http://www.boost.org/community/error_handling.html">Error and Exception Handling</a>
+"http://www.boost.org/more/error_handling.html">Error and Exception Handling</a>
 for the explanation.</p>

 <h3><a id="header-files">Header Files</a></h3>
@@ -412,13 +390,13 @@ in the header <a href=
 </table>
 <h3><a id="concepts-modeled">Concepts Modeled</a></h3>
 <a href=
-"https://boost.org/sgi/stl/Assignable.html">Assignable</a>, <a
+"http://www.sgi.com/tech/stl/Assignable.html">Assignable</a>, <a
 href=
-"https://boost.org/sgi/stl/DefaultConstructible.html">Default
+"http://www.sgi.com/tech/stl/DefaultConstructible.html">Default
 Constructible</a>, <a href=
-"https://boost.org/sgi/stl/EqualityComparable.html">Equality
+"http://www.sgi.com/tech/stl/EqualityComparable.html">Equality
 Comparable</a>, <a href=
-"https://boost.org/sgi/stl/LessThanComparable.html">LessThan
+"http://www.sgi.com/tech/stl/LessThanComparable.html">LessThan
 Comparable</a>.

 <h3><a id="type-requirements">Type requirements</a></h3>
@@ -573,30 +551,19 @@ The maximum value of <tt>size_type</tt>.
 <hr />
 <pre>
 <a id=
-"cons0">dynamic_bitset</a>()
-</pre>
-
-<b>Effects:</b> Constructs a bitset of size zero. The allocator
-for this bitset is a default-constructed object of type
-<tt>Allocator</tt>.<br />
- <b>Postconditions:</b> <tt>this-&gt;size() == 0</tt>.<br />
- <b>Throws:</b> Nothing unless the default constructor of
-<tt>Allocator</tt> throws an exception.<br />
- (Required by <a href=
-"https://boost.org/sgi/stl/DefaultConstructible.html">Default
-Constructible</a>.)
-
-<hr />
-<pre>
-<a id=
-"cons1">dynamic_bitset</a>(const Allocator&amp; alloc)
+"cons1">dynamic_bitset</a>(const Allocator&amp; alloc = Allocator())
 </pre>

 <b>Effects:</b> Constructs a bitset of size zero. A copy of the
 <tt>alloc</tt> object will be used in subsequent bitset
 operations such as <tt>resize</tt> to allocate memory.<br />
 <b>Postconditions:</b> <tt>this-&gt;size() == 0</tt>.<br />
- <b>Throws:</b> nothing.
+ <b>Throws:</b> An allocation error if memory is exhausted
+(<tt>std::bad_alloc</tt> if
+<tt>Allocator=std::allocator</tt>).<br />
+ (Required by <a href=
+"http://www.sgi.com/tech/stl/DefaultConstructible.html">Default
+Constructible</a>.)

 <hr />
 <pre>
@@ -651,21 +618,7 @@ allocator in <tt>x</tt>. <br />
 (<tt>std::bad_alloc</tt> if
 <tt>Allocator=std::allocator</tt>).<br />
 (Required by <a href=
-"https://boost.org/sgi/stl/Assignable.html">Assignable</a>.)
-
-<hr />
-<pre>
-<a id="move-cons">dynamic_bitset</a>(dynamic_bitset&amp;&amp; x)
-</pre>
-
-<b>Effects:</b> Constructs a bitset that is the same as the bitset
-<tt>x</tt>, while using the resources from <tt>x</tt>. The allocator
-for this bitset is moved from the allocator in <tt>x</tt>. <br />
- <b>Postconditions:</b> For all <tt>i</tt> in the range
-<tt>[0,x.size())</tt>, <tt>(*this)[i] == x[i]</tt>.<br />
- <b>Throws:</b> An allocation error if memory is exhausted
-(<tt>std::bad_alloc</tt> if
-<tt>Allocator=std::allocator</tt>).
+"http://www.sgi.com/tech/stl/Assignable.html">Assignable</a>.)

 <hr />
 <pre>
@@ -734,7 +687,7 @@ position <tt>(b * bits_per_block + i)</tt> in the bitset (where
 <br />
 <b>Requires:</b> <tt>BlockInputIterator</tt> must be either an
 integral type or a model of <a href=
-    "https://boost.org/sgi/stl/InputIterator.html">Input
+    "http://www.sgi.com/tech/stl/InputIterator.html">Input
    Iterator</a> whose <tt>value_type</tt> is the same type as
 <tt>Block</tt>.<br /> <b>Throws:</b> An allocation error if
 memory is exhausted (<tt>std::bad_alloc</tt> if
@@ -745,11 +698,11 @@ memory is exhausted (<tt>std::bad_alloc</tt> if
 template&lt;typename Char, typename Traits, typename Alloc&gt;
 explicit
 <a id="cons3">dynamic_bitset</a>(const <a href=
-"https://boost.org/sgi/stl/basic_string.html">std::basic_string</a>&lt;Char,Traits,Alloc&gt;&amp; s,
+"http://www.sgi.com/tech/stl/basic_string.html">std::basic_string</a>&lt;Char,Traits,Alloc&gt;&amp; s,
               typename std::basic_string&lt;CharT, Traits, Alloc&gt;::size_type pos = 0,
               typename std::basic_string&lt;CharT, Traits, Alloc&gt;::size_type n = <a
 href=
-"https://boost.org/sgi/stl/basic_string.html">std::basic_string</a>&lt;Char,Traits,Alloc&gt;::npos,
+"http://www.sgi.com/tech/stl/basic_string.html">std::basic_string</a>&lt;Char,Traits,Alloc&gt;::npos,
               const Allocator&amp; alloc = Allocator())
 </pre>

@@ -808,21 +761,7 @@ dynamic_bitset&amp; <a id=
 <b>Returns:</b> <tt>*this</tt>.<br />
 <b>Throws:</b> nothing. <br />
 (Required by <a href=
-"https://boost.org/sgi/stl/Assignable.html">Assignable</a>.)
-
-<hr />
-<pre>
-dynamic_bitset&amp; <a id=
-"move-assign">operator=</a>(dynamic_bitset&amp;&amp; x)
-</pre>
-
-<b>Effects:</b> This bitset becomes the same as the bitset
-<tt>x</tt>, while using the resources from <tt>x</tt>.<br />
- <b>Postconditions:</b> For all <tt>i</tt> in the range
-<tt>[0,x.size())</tt>, <tt>(*this)[i] == x[i]</tt>.<br />
- <b>Returns:</b> <tt>*this</tt>.<br />
- <b>Throws:</b> An allocation error if memory is exhausted
-(<tt>std::bad_alloc</tt> if <tt>Allocator=std::allocator</tt>).
+"http://www.sgi.com/tech/stl/Assignable.html">Assignable</a>.)

 <hr />
 <pre>
@@ -857,15 +796,6 @@ void <a id="clear">clear</a>()
 <b>Effects:</b> The size of the bitset becomes zero.<br />
 <b>Throws:</b> nothing.

-<hr />
-<pre>
-void <a id="pop_back">pop_back</a>();
-</pre>
-
-<b>Precondition:</b> <tt>!this-&gt;empty()</tt>.<br />
-<b>Effects:</b> Decreases the size of the bitset by one.<br />
- <b>Throws:</b> nothing.
-
 <hr />
 <pre>
 void <a id="push_back">push_back</a>(bool value);
@@ -911,7 +841,7 @@ for (; first != last; ++first)

 <b>Requires:</b> The <tt>BlockInputIterator</tt> type must be a
 model of <a href=
-"https://boost.org/sgi/stl/InputIterator.html">Input
+"http://www.sgi.com/tech/stl/InputIterator.html">Input
 Iterator</a> and the <tt>value_type</tt> must be the same type as
 <tt>Block</tt>.<br />
 <b>Throws:</b> An allocation error if memory is exhausted
@@ -1080,18 +1010,6 @@ dynamic_bitset&amp; <a id="reset1">reset</a>()
 <b>Returns:</b> <tt>*this</tt><br />
 <b>Throws:</b> nothing.

-<hr />
-<pre>
-dynamic_bitset&amp; <a id=
-"set3">set</a>(size_type n, size_type len, bool val);
-</pre>
-
-<b>Precondition:</b> <tt>n + len &lt; this-&gt;size()</tt>.<br />
-<b>Effects:</b> Sets every bit indexed from <tt>n</tt> to
-<tt>n + len - 1</tt> inclusively if <tt>val</tt> is <tt>true</tt>, and
-clears them if <tt>val</tt> is <tt>false</tt>. <br />
-<b>Returns:</b> <tt>*this</tt>
-
 <hr />
 <pre>
 dynamic_bitset&amp; <a id=
@@ -1104,17 +1022,6 @@ dynamic_bitset&amp; <a id=
 <tt>false</tt>. <br />
 <b>Returns:</b> <tt>*this</tt>

-<hr />
-<pre>
-dynamic_bitset&amp; <a id=
-"reset3">reset</a>(size_type n, size_type len);
-</pre>
-
-<b>Precondition:</b> <tt>n + len &lt; this-&gt;size()</tt>.<br />
-<b>Effects:</b> Clears every bit indexed from <tt>n</tt> to
-<tt>n + len - 1</tt> inclusively.<br />
-<b>Returns:</b> <tt>*this</tt>
-
 <hr />
 <pre>
 dynamic_bitset&amp; <a id="reset2">reset</a>(size_type n)
@@ -1124,16 +1031,6 @@ dynamic_bitset&amp; <a id="reset2">reset</a>(size_type n)
 <b>Effects:</b> Clears bit <tt>n</tt>.<br />
 <b>Returns:</b> <tt>*this</tt>

-<hr />
-<pre>
-dynamic_bitset&amp; <a id="flip3">flip</a>(size_type n, size_type len)
-</pre>
-
-<b>Precondition:</b> <tt>n + len &lt; this-&gt;size()</tt>.<br />
-<b>Effects:</b> Flips every bit indexed from <tt>n</tt> to
-<tt>n + len - 1</tt> inclusively.<br />
-<b>Returns:</b> <tt>*this</tt>
-
 <hr />
 <pre>
 dynamic_bitset&amp; <a id="flip2">flip</a>(size_type n)
@@ -1180,40 +1077,6 @@ bool <a id="empty">empty</a>() const;
 otherwise. <i>Note</i>: not to be confused with <tt>none()</tt>, that has
 different semantics.

-<hr />
-<pre>
-size_type <a id="capacity">capacity</a>() const;
-</pre>
-
-<b>Returns:</b>  The total number of elements that <tt>*this</tt> can hold without requiring
-reallocation.<br />
-<b>Throws:</b> nothing.
-
-<hr />
-<pre>
-void <a id="reserve">reserve</a>(size_type num_bits);
-</pre>
-
-<b>Effects:</b> A directive that informs the bitset of a planned change in size, so that it can
-manage the storage allocation accordingly. After reserve(), capacity() is greater or equal to the
-argument of reserve() if reallocation happens; and equal to the previous value of capacity() otherwise.
-Reallocation happens at this point if and only if the current capacity is less than the argument of
-reserve(). <br />
-<i>Note:</i> It does not change the size() of the bitset.<br />
-<b>Postcondtitions:</b> <tt>this->capacity() >= num_bits</tt>.<br />
-<b>Throws:</b> An allocation error if memory is exhausted
-(<tt>std::bad_alloc</tt> if <tt>Allocator=std::allocator</tt>).
-
-<hr />
-<pre>
-void <a id="shrink_to_fit">shrink_to_fit</a>();
-</pre>
-
-<b>Effects:</b> shrink_to_fit() is a request to reduce memory use by removing unused capacity.<br />
-<i>Note:</i> It does not change the size() of the bitset.<br />
-<b>Throws:</b> An allocation error if memory is exhausted
-(<tt>std::bad_alloc</tt> if <tt>Allocator=std::allocator</tt>).
-
 <hr />
 <pre>
 size_type <a id="count">count</a>() const
@@ -1223,15 +1086,6 @@ size_type <a id="count">count</a>() const
 set.<br />
 <b>Throws:</b> nothing.

-<hr />
-<pre>
-bool <a id="all">all</a>() const
-</pre>
-
-<b>Returns:</b> <tt>true</tt> if all bits in this bitset are set or
-if <tt>size() == 0</tt>, and otherwise returns <tt>false</tt>.<br />
-<b>Throws:</b> nothing.
-
 <hr />
 <pre>
 bool <a id="any">any</a>() const
@@ -1259,18 +1113,6 @@ bool <a id="test">test</a>(size_type n) const
 <b>Returns:</b> <tt>true</tt> if bit <tt>n</tt> is set and
 <tt>false</tt> is bit <tt>n</tt> is 0.

-<hr />
-<pre>
-bool <a id="test">test_set</a>(size_type n, bool val = true)
-</pre>
-
-<b>Precondition:</b> <tt>n &lt; this-&gt;size()</tt>.<br />
- <b>Effects:</b> Sets bit <tt>n</tt> if <tt>val</tt> is
-<tt>true</tt>, and clears bit <tt>n</tt> if <tt>val</tt> is
-<tt>false</tt>. <br />
- <b>Returns:</b> <tt>true</tt> if the previous state of bit
-<tt>n</tt> was set and <tt>false</tt> is bit <tt>n</tt> is 0.
-
 <hr />
 <pre>
 reference <a id="bracket">operator[]</a>(size_type n)
@@ -1332,19 +1174,6 @@ also set and if <tt>this-&gt;count() &lt; a.count()</tt>.
 Otherwise this function returns false.<br />
 <b>Throws:</b> nothing.

-<hr />
-<pre>
-bool <a id=
-"intersects">intersects</a>(const dynamic_bitset&amp; a) const
-</pre>
-
-<b>Requires:</b> <tt>this-&gt;size() == a.size()</tt><br />
-<b>Returns:</b> true if this bitset and <tt>a</tt> intersect.
-That is, it returns true if, there is a bit which is set in this
-bitset, such that the corresponding bit in bitset <tt>a</tt> is
-also set. Otherwise this function returns false.<br />
-<b>Throws:</b> nothing.
-
 <hr />
 <pre>
 size_type <a id = "find_first">find_first</a>() const;
@@ -1374,7 +1203,7 @@ rhs.size()</tt> and if for all <tt>i</tt> in the range
 returns <tt>false</tt>.<br />
 <b>Throws:</b> nothing.<br />
 (Required by <a href=
-"https://boost.org/sgi/stl/EqualityComparable.html">Equality
+"http://www.sgi.com/tech/stl/EqualityComparable.html">Equality
 Comparable</a>.)

 <hr />
@@ -1386,7 +1215,7 @@ bool <a id=
 <b>Returns:</b> <tt>!((*this) == rhs)</tt><br />
 <b>Throws:</b> nothing.<br />
 (Required by <a href=
-"https://boost.org/sgi/stl/EqualityComparable.html">Equality
+"http://www.sgi.com/tech/stl/EqualityComparable.html">Equality
 Comparable</a>.)

 <hr />
@@ -1398,11 +1227,11 @@ bool <a id=
 <b>Returns:</b> <tt>true</tt> if this bitset is lexicographically
 less than <tt>rhs</tt>, and returns <tt>false</tt> otherwise.
 (See the description of <a href=
-"https://boost.org/sgi/stl/lexicographical_compare.html">lexicographical_compare</a>
+"http://www.sgi.com/tech/stl/lexicographical_compare.html">lexicographical_compare</a>
 for a definition of lexicographic ordering). <br />
 <b>Throws:</b> nothing.<br />
 (Required by <a href=
-"https://boost.org/sgi/stl/LessThanComparable.html">Less Than
+"http://www.sgi.com/tech/stl/LessThanComparable.html">Less Than
 Comparable</a>.)

 <hr />
@@ -1415,7 +1244,7 @@ bool <a id=
 rhs)</tt><br />
 <b>Throws:</b> nothing.<br />
 (Required by <a href=
-"https://boost.org/sgi/stl/LessThanComparable.html">Less Than
+"http://www.sgi.com/tech/stl/LessThanComparable.html">Less Than
 Comparable</a>.)

 <hr />
@@ -1427,7 +1256,7 @@ bool <a id=
 <b>Returns:</b> <tt>(*this) &lt; rhs || (*this) == rhs</tt><br />
 <b>Throws:</b> nothing.<br />
 (Required by <a href=
-"https://boost.org/sgi/stl/LessThanComparable.html">Less Than
+"http://www.sgi.com/tech/stl/LessThanComparable.html">Less Than
 Comparable</a>.)

 <hr />
@@ -1439,7 +1268,7 @@ bool <a id=
 <b>Returns:</b> <tt>(*this) &gt; rhs || (*this) == rhs</tt><br />
 <b>Throws:</b> nothing.<br />
 (Required by <a href=
-"https://boost.org/sgi/stl/LessThanComparable.html">Less Than
+"http://www.sgi.com/tech/stl/LessThanComparable.html">Less Than
 Comparable</a>.)

 <hr />
@@ -1499,7 +1328,7 @@ template &lt;typename CharT, typename Alloc&gt;
 void <a id=
 "to_string">to_string</a>(const dynamic_bitset&lt;Block, Allocator&gt;&amp; b,
               <a href=
-"https://boost.org/sgi/stl/basic_string.html">std::basic_string</a>&lt;Char,Traits,Alloc&gt;&amp; s)
+"http://www.sgi.com/tech/stl/basic_string.html">std::basic_string</a>&lt;Char,Traits,Alloc&gt;&amp; s)
 </pre>

 <b>Effects:</b> Copies a representation of <tt>b</tt> into the
@@ -1537,7 +1366,7 @@ block <tt>bval</tt> written, the bit <tt>(bval &gt;&gt; i) &amp;
 + i)</tt> in the bitset.<br />
 <b>Requires:</b> The type <tt>BlockOutputIterator</tt> must be a
 model of <a href=
-"https://boost.org/sgi/stl/OutputIterator.html">Output
+"http://www.sgi.com/tech/stl/OutputIterator.html">Output
 Iterator</a> and its <tt>value_type</tt> must be the same type as
 <tt>Block</tt>. Further, the size of the output range must be
 greater or equal <tt>b.num_blocks()</tt>.
@@ -1553,7 +1382,7 @@ void <a id=
 <b>Effects:</b> Reads blocks from the iterator range into the
 bitset. <br />
 <b>Requires:</b> The type <tt>BlockIterator</tt> must be a model
-of <a href="https://boost.org/sgi/stl/InputIterator.html">Input
+of <a href="http://www.sgi.com/tech/stl/InputIterator.html">Input
 Iterator</a> and its <tt>value_type</tt> must be the same type as
 <tt>Block</tt>. The size of the iterator range must be less or
 equal to <tt>b.num_blocks()</tt>.
@@ -1666,14 +1495,6 @@ exception guarantee.
 <hr />
 <h3><a id="changes-from-previous-ver">Changes from previous version(s)</a></h3>

-<h4><i>Changes in Boost 1.56.0</i></h4>
-<ul>
-<li>Support for C++11 move constructors.</li>
-<li>Warning fixes on MSVC 2013.</li>
-<li>Support for C++11 minimal allocators.</li>
-<li>Add noexcept specifications.</li>
-</ul>
-
 <h4><i>Changes in Boost 1.37.0</i></h4>
 <ul>
 <li>The constructor from a block range implements a "do the right thing"
@@ -1726,20 +1547,17 @@ applied to their corresponding <tt>dynamic_bitset</tt>s.
 </li>
 </ul>
 <i>General improvements</i>
-<ul>
-<li>
+<br /><br />
 Several optimizations to member and non-member functions and to the
 nested class <tt>reference</tt>.
-</li>
-</ul>

 <hr />
 <h3><a id="see-also">See also</a></h3>

 <tt><a href=
-"https://boost.org/sgi/stl/bitset.html">std::bitset</a></tt>,
+"http://www.sgi.com/tech/stl/bitset.html">std::bitset</a></tt>,
 <tt><a href=
-"https://boost.org/sgi/stl/Vector.html">std::vector</a></tt>,
+"http://www.sgi.com/tech/stl/Vector.html">std::vector</a></tt>,

 <h3><a id="acknowledgements">Acknowledgements</a></h3>

@@ -1763,18 +1581,6 @@ href="mailto:cda@freshsources.com">cda@freshsources.com</a>)<br
        href="http://gennaro-prota.50webs.com/">Gennaro Prota</a>
    (name.surname yahoo.com)</td>
 </tr>
-<tr>
-<td>Copyright &copy; 2014</td>
-<td>Ahmed Charles (<a href="mailto:acharles@outlook.com">acharles@outlook.com</a>)</td>
-</tr>
-<tr>
-<td>Copyright &copy; 2014</td>
-<td>Glen Fernandes (<a href="mailto:glenjofe@gmail.com">glenjofe@gmail.com</a>)</td>
-</tr>
-<tr>
-<td>Copyright &copy; 2014</td>
-<td>Riccardo Marcangelo (<a href="mailto:ricky.65@outlook.com">ricky.65@outlook.com</a>)</td>
-</tr>
 </table>
 <br />
 <div class="legalnotice">
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -1,15 +1,13 @@
-# -----------------------------------------------------------
-#              Copyright (c) 2002 Gennaro Prota
-#
-# 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)
-#
-# -----------------------------------------------------------
-
+// -----------------------------------------------------------
+//              Copyright (c) 2002 Gennaro Prota
+//
+// 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)
+//
+// -----------------------------------------------------------
 exe timing_tests 
    : timing_tests.cpp 
-      ../../timer/build//boost_timer
    ;

 exe example1
--- a/example/timing_tests.cpp
+++ b/example/timing_tests.cpp
@@ -23,10 +23,6 @@
 //   table in detail/dynamic_bitset.hpp and report any interesting
 //   discovery on the list as well.

-//   You might also want to try both counting methods (by_bytes vs.
-//   by_blocks) to see if the one that is selected automatically is
-//   actually the fastest on your system.
-
 //
 //
 // -----------------------------------------------------------------------//
@@ -49,7 +45,7 @@

 #include "boost/cstdlib.hpp"
 #include "boost/version.hpp"
-#include "boost/timer/timer.hpp"
+#include "boost/timer.hpp"
 #include "boost/dynamic_bitset.hpp"


@@ -59,9 +55,9 @@ namespace {
    // see http://gcc.gnu.org/ml/gcc-bugs/1999-03n/msg00884.html
    //
    class boost_version {
-        int m_major;
-        int m_minor;
-        int m_subminor;
+        const int m_major;
+        const int m_minor;
+        const int m_subminor;

    public:
        boost_version(unsigned long v = BOOST_VERSION):
@@ -94,15 +90,12 @@ void prologue()
 template <typename T>
 void timing_test(T* = 0) // dummy parameter to workaround VC6
 {
-#ifndef BOOST_NO_STRESS_TEST
-    const unsigned long num = 30 * 100000;
-#else
-    const unsigned long num = 30 * 1000;
-#endif
+
+    const unsigned long num = 100000;


    // This variable is printed at the end of the test,
-    // to prevent the optimizer from removing the call to
+    // to prevent the optimizer eliminating the call to
    // count() in the loop below.
    typename boost::dynamic_bitset<T>::size_type dummy = 0;

@@ -111,13 +104,16 @@ void timing_test(T* = 0) // dummy parameter to workaround VC6
    std::cout << "--------------------------------------------------\n";

    {
-        boost::timer::auto_cpu_timer time;
+        boost::timer time;

        const typename boost::dynamic_bitset<T>::size_type sz = 5000;
        for (unsigned long i = 0; i < num; ++i) {
            boost::dynamic_bitset<T> bs(sz, i);
            dummy += bs.count();
        }
+
+        const double elaps = time.elapsed();
+        std::cout << "Elapsed: " << elaps << '\n';
    }

    std::cout << "(total count: " << dummy << ")\n\n";
@@ -127,6 +123,7 @@ void timing_test(T* = 0) // dummy parameter to workaround VC6

 int main()
 {
+
    prologue();

    timing_test<unsigned char>();
--- a/include/boost/detail/dynamic_bitset.hpp
+++ b/include/boost/detail/dynamic_bitset.hpp
@@ -0,0 +1,229 @@
+// -----------------------------------------------------------
+//
+//   Copyright (c) 2001-2002 Chuck Allison and Jeremy Siek
+//        Copyright (c) 2003-2006, 2008 Gennaro Prota
+//
+// 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)
+//
+// -----------------------------------------------------------
+
+#ifndef BOOST_DETAIL_DYNAMIC_BITSET_HPP
+#define BOOST_DETAIL_DYNAMIC_BITSET_HPP
+
+#include <cstddef>
+#include "boost/config.hpp"
+#include "boost/detail/workaround.hpp"
+
+
+namespace boost {
+
+  namespace detail {
+  namespace dynamic_bitset_impl {
+
+    // Gives (read-)access to the object representation
+    // of an object of type T (3.9p4). CANNOT be used
+    // on a base sub-object
+    //
+    template <typename T>
+    inline const unsigned char * object_representation (T* p)
+    {
+        return static_cast<const unsigned char *>(static_cast<const void *>(p));
+    }
+
+    template<typename T, int amount, int width /* = default */>
+    struct shifter
+    {
+        static void left_shift(T & v) {
+            amount >= width ? (v = 0)
+                : (v >>= BOOST_DYNAMIC_BITSET_WRAP_CONSTANT(amount));
+        }
+    };
+
+    // ------- count function implementation --------------
+
+    typedef unsigned char byte_type;
+
+    // These two entities
+    //
+    //     enum mode { access_by_bytes, access_by_blocks };
+    //     template <mode> struct mode_to_type {};
+    //
+    // were removed, since the regression logs (as of 24 Aug 2008)
+    // showed that several compilers had troubles with recognizing
+    //
+    //   const mode m = access_by_bytes
+    //
+    // as a constant expression
+    //
+    // * So, we'll use bool, instead of enum *.
+    //
+    template <bool value>
+    struct value_to_type
+    {
+        value_to_type() {}
+    };
+    const bool access_by_bytes = true;
+    const bool access_by_blocks = false;
+
+
+    // the table: wrapped in a class template, so
+    // that it is only instantiated if/when needed
+    //
+    template <bool dummy_name = true>
+    struct count_table { static const byte_type table[]; };
+
+    template <>
+    struct count_table<false> { /* no table */ };
+
+
+     const unsigned int table_width = 8;
+     template <bool b>
+     const byte_type count_table<b>::table[] =
+     {
+       // Automatically generated by GPTableGen.exe v.1.0
+       //
+     0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+     1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+     1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+     2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+     1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+     2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+     2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+     3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
+     };
+
+
+     // overload for access by bytes
+     //
+
+     template <typename Iterator>
+     inline std::size_t do_count(Iterator first, std::size_t length,
+                                 int /*dummy param*/,
+                                 value_to_type<access_by_bytes>* )
+     {
+         std::size_t num = 0;
+         if (length)
+         {
+             const byte_type * p = object_representation(&*first);
+             length *= sizeof(*first);
+
+              do {
+                 num += count_table<>::table[*p];
+                 ++p;
+                 --length;
+
+             } while (length);
+         }
+
+         return num;
+     }
+
+
+     // overload for access by blocks
+     //
+     template <typename Iterator, typename ValueType>
+     inline std::size_t do_count(Iterator first, std::size_t length, ValueType,
+                                 value_to_type<access_by_blocks>*)
+     {
+         std::size_t num = 0;
+         while (length){
+
+             ValueType value = *first;
+             while (value) {
+                 num += count_table<>::table[value & ((1u<<table_width) - 1)];
+                 value >>= table_width;
+             }
+
+             ++first;
+             --length;
+         }
+
+         return num;
+     }
+
+    // -------------------------------------------------------
+
+
+    // Some library implementations simply return a dummy
+    // value such as
+    //
+    //   size_type(-1) / sizeof(T)
+    //
+    // from vector<>::max_size. This tries to get more
+    // meaningful info.
+    //
+    template <typename T>
+    typename T::size_type vector_max_size_workaround(const T & v) {
+
+      typedef typename T::allocator_type allocator_type;
+
+      const typename allocator_type::size_type alloc_max =
+                                                  v.get_allocator().max_size();
+      const typename T::size_type container_max = v.max_size();
+
+      return alloc_max < container_max?
+                    alloc_max :
+                    container_max;
+    }
+
+    // for static_asserts
+    template <typename T>
+    struct allowed_block_type {
+        enum { value = T(-1) > 0 }; // ensure T has no sign
+    };
+
+    template <>
+    struct allowed_block_type<bool> {
+        enum { value = false };
+    };
+
+
+    template <typename T>
+    struct is_numeric {
+        enum { value = false };
+    };
+
+#   define BOOST_dynamic_bitset_is_numeric(x)       \
+                template<>                          \
+                struct is_numeric< x > {            \
+                    enum { value = true };          \
+                }                                /**/
+
+    BOOST_dynamic_bitset_is_numeric(bool);
+    BOOST_dynamic_bitset_is_numeric(char);
+
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+    BOOST_dynamic_bitset_is_numeric(wchar_t);
+#endif
+
+    BOOST_dynamic_bitset_is_numeric(signed char);
+    BOOST_dynamic_bitset_is_numeric(short int);
+    BOOST_dynamic_bitset_is_numeric(int);
+    BOOST_dynamic_bitset_is_numeric(long int);
+
+    BOOST_dynamic_bitset_is_numeric(unsigned char);
+    BOOST_dynamic_bitset_is_numeric(unsigned short);
+    BOOST_dynamic_bitset_is_numeric(unsigned int);
+    BOOST_dynamic_bitset_is_numeric(unsigned long);
+
+#if defined(BOOST_HAS_LONG_LONG)
+    BOOST_dynamic_bitset_is_numeric(::boost::long_long_type);
+    BOOST_dynamic_bitset_is_numeric(::boost::ulong_long_type);
+#endif
+
+    // intentionally omitted
+    //BOOST_dynamic_bitset_is_numeric(float);
+    //BOOST_dynamic_bitset_is_numeric(double);
+    //BOOST_dynamic_bitset_is_numeric(long double);
+
+#undef BOOST_dynamic_bitset_is_numeric
+
+  } // dynamic_bitset_impl
+  } // namespace detail
+
+} // namespace boost
+
+#endif // include guard
+
--- a/include/boost/dynamic_bitset/config.hpp
+++ b/include/boost/dynamic_bitset/config.hpp
@@ -34,7 +34,7 @@ namespace boost { namespace detail {
 #endif

 //
-#if (defined BOOST_BORLANDC && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564)))  \
+#if (defined __BORLANDC__ && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)))  \
                             || (defined BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
 #define BOOST_DYNAMIC_BITSET_DONT_USE_FRIENDS
 #endif
--- a/include/boost/dynamic_bitset/detail/dynamic_bitset.hpp
+++ b/include/boost/dynamic_bitset/detail/dynamic_bitset.hpp
@@ -1,307 +0,0 @@
-// -----------------------------------------------------------
-//
-//   Copyright (c) 2001-2002 Chuck Allison and Jeremy Siek
-//   Copyright (c) 2003-2006, 2008 Gennaro Prota
-//   Copyright (c) 2014 Glen Joseph Fernandes
-//       (glenjofe@gmail.com)
-//   Copyright (c) 2018 Evgeny Shulgin
-//   Copyright (c) 2019 Andrey Semashev
-//
-// 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)
-//
-// -----------------------------------------------------------
-
-#ifndef BOOST_DETAIL_DYNAMIC_BITSET_HPP
-#define BOOST_DETAIL_DYNAMIC_BITSET_HPP
-
-#include <memory>
-#include <cstddef>
-#include "boost/config.hpp"
-#include "boost/detail/workaround.hpp"
-#include <boost/core/allocator_access.hpp>
-
-#if ((defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)) || (defined(__clang__) && defined(__c2__)) || (defined(BOOST_INTEL) && defined(_MSC_VER))) && (defined(_M_IX86) || defined(_M_X64))
-#include <intrin.h>
-#endif
-
-namespace boost {
-
-  namespace detail {
-  namespace dynamic_bitset_impl {
-
-    template<class T>
-    struct max_limit {
-        BOOST_STATIC_CONSTEXPR T value = static_cast<T>(-1);
-    };
-
-    template<class T>
-    BOOST_CONSTEXPR_OR_CONST T max_limit<T>::value;
-
-    // Gives (read-)access to the object representation
-    // of an object of type T (3.9p4). CANNOT be used
-    // on a base sub-object
-    //
-    template <typename T>
-    inline const unsigned char * object_representation (T* p)
-    {
-        return static_cast<const unsigned char *>(static_cast<const void *>(p));
-    }
-
-    template<typename T, int amount, int width /* = default */>
-    struct shifter
-    {
-        static void left_shift(T & v) {
-            amount >= width ? (v = 0)
-                : (v >>= BOOST_DYNAMIC_BITSET_WRAP_CONSTANT(amount));
-        }
-    };
-
-    // ------- count function implementation --------------
-
-    typedef unsigned char byte_type;
-
-    // These two entities
-    //
-    //     enum mode { access_by_bytes, access_by_blocks };
-    //     template <mode> struct mode_to_type {};
-    //
-    // were removed, since the regression logs (as of 24 Aug 2008)
-    // showed that several compilers had troubles with recognizing
-    //
-    //   const mode m = access_by_bytes
-    //
-    // as a constant expression
-    //
-    // * So, we'll use bool, instead of enum *.
-    //
-    template <bool value>
-    struct value_to_type
-    {
-        value_to_type() {}
-    };
-    const bool access_by_bytes = true;
-    const bool access_by_blocks = false;
-
-
-    // the table: wrapped in a class template, so
-    // that it is only instantiated if/when needed
-    //
-    template <bool dummy_name = true>
-    struct count_table { static const byte_type table[]; };
-
-    template <>
-    struct count_table<false> { /* no table */ };
-
-
-    const unsigned int table_width = 8;
-    template <bool b>
-    const byte_type count_table<b>::table[] =
-    {
-        // Automatically generated by GPTableGen.exe v.1.0
-        //
-        0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-        1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-        1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-        2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-        1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-        2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-        2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-        3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
-    };
-
-
-    // Some platforms have fast popcount operation, that allow us to implement
-    // counting bits much more efficiently
-    //
-    template <typename ValueType>
-    BOOST_FORCEINLINE std::size_t popcount(ValueType value) BOOST_NOEXCEPT
-    {
-        std::size_t num = 0u;
-        while (value) {
-            num += count_table<>::table[value & ((1u<<table_width) - 1)];
-            value >>= table_width;
-        }
-        return num;
-    }
-
-#if (((defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)) || (defined(__clang__) && defined(__c2__)) || (defined(BOOST_INTEL) && defined(_MSC_VER))) && (defined(_M_IX86) || defined(_M_X64))) \
-    && (defined(__POPCNT__) || defined(__AVX__))
-
-    template <>
-    BOOST_FORCEINLINE std::size_t popcount<unsigned short>(unsigned short value) BOOST_NOEXCEPT
-    {
-        return static_cast<std::size_t>(__popcnt16(value));
-    }
-
-    template <>
-    BOOST_FORCEINLINE std::size_t popcount<unsigned int>(unsigned int value) BOOST_NOEXCEPT
-    {
-        return static_cast<std::size_t>(__popcnt(value));
-    }
-
-    template <>
-    BOOST_FORCEINLINE std::size_t popcount<unsigned __int64>(unsigned __int64 value) BOOST_NOEXCEPT
-    {
-#if defined(_M_X64)
-        return static_cast<std::size_t>(__popcnt64(value));
-#else
-        return static_cast<std::size_t>(__popcnt(static_cast< unsigned int >(value))) + static_cast<std::size_t>(__popcnt(static_cast< unsigned int >(value >> 32)));
-#endif
-    }
-
-#elif defined(BOOST_GCC) || defined(__clang__) || (defined(BOOST_INTEL) && defined(__GNUC__))
-
-    // Note: gcc builtins are implemented by compiler runtime when the target CPU may not support the necessary instructions
-    template <>
-    BOOST_FORCEINLINE std::size_t popcount<unsigned short>(unsigned short value) BOOST_NOEXCEPT
-    {
-        return static_cast<unsigned int>(__builtin_popcount(static_cast<unsigned int>(value)));
-    }
-
-    template <>
-    BOOST_FORCEINLINE std::size_t popcount<unsigned int>(unsigned int value) BOOST_NOEXCEPT
-    {
-        return static_cast<unsigned int>(__builtin_popcount(value));
-    }
-
-    template <>
-    BOOST_FORCEINLINE std::size_t popcount<unsigned long>(unsigned long value) BOOST_NOEXCEPT
-    {
-        return static_cast<unsigned int>(__builtin_popcountl(value));
-    }
-
-    template <>
-    BOOST_FORCEINLINE std::size_t popcount<boost::ulong_long_type>(boost::ulong_long_type value) BOOST_NOEXCEPT
-    {
-        return static_cast<unsigned int>(__builtin_popcountll(value));
-    }
-
-#endif
-
-    // overload for access by blocks
-    //
-    template <typename Iterator, typename ValueType>
-    inline std::size_t do_count(Iterator first, std::size_t length, ValueType,
-                                value_to_type<access_by_blocks>*)
-    {
-        std::size_t num1 = 0u, num2 = 0u;
-        while (length >= 2u) {
-            num1 += popcount<ValueType>(*first);
-            ++first;
-            num2 += popcount<ValueType>(*first);
-            ++first;
-            length -= 2u;
-        }
-
-        if (length > 0u)
-            num1 += popcount<ValueType>(*first);
-
-        return num1 + num2;
-    }
-
-    // overload for access by bytes
-    //
-    template <typename Iterator>
-    inline std::size_t do_count(Iterator first, std::size_t length,
-                                int /*dummy param*/,
-                                value_to_type<access_by_bytes>*)
-    {
-        if (length > 0u) {
-            const byte_type* p = object_representation(&*first);
-            length *= sizeof(*first);
-
-            return do_count(p, length, static_cast<byte_type>(0u),
-                static_cast< value_to_type<access_by_blocks>* >(0));
-        }
-
-        return 0u;
-    }
-
-    // -------------------------------------------------------
-
-
-    // Some library implementations simply return a dummy
-    // value such as
-    //
-    //   size_type(-1) / sizeof(T)
-    //
-    // from vector<>::max_size. This tries to get more
-    // meaningful info.
-    //
-    template <typename T>
-    inline typename T::size_type vector_max_size_workaround(const T & v)
-        BOOST_NOEXCEPT
-    {
-        typedef typename T::allocator_type allocator_type;
-
-        const allocator_type& alloc = v.get_allocator();
-
-        typename boost::allocator_size_type<allocator_type>::type alloc_max =
-            boost::allocator_max_size(alloc);
-
-        const typename T::size_type container_max = v.max_size();
-
-        return alloc_max < container_max ? alloc_max : container_max;
-    }
-
-    // for static_asserts
-    template <typename T>
-    struct allowed_block_type {
-        enum { value = T(-1) > 0 }; // ensure T has no sign
-    };
-
-    template <>
-    struct allowed_block_type<bool> {
-        enum { value = false };
-    };
-
-
-    template <typename T>
-    struct is_numeric {
-        enum { value = false };
-    };
-
-#   define BOOST_dynamic_bitset_is_numeric(x)       \
-                template<>                          \
-                struct is_numeric< x > {            \
-                    enum { value = true };          \
-                }                                /**/
-
-    BOOST_dynamic_bitset_is_numeric(bool);
-    BOOST_dynamic_bitset_is_numeric(char);
-
-#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
-    BOOST_dynamic_bitset_is_numeric(wchar_t);
-#endif
-
-    BOOST_dynamic_bitset_is_numeric(signed char);
-    BOOST_dynamic_bitset_is_numeric(short int);
-    BOOST_dynamic_bitset_is_numeric(int);
-    BOOST_dynamic_bitset_is_numeric(long int);
-
-    BOOST_dynamic_bitset_is_numeric(unsigned char);
-    BOOST_dynamic_bitset_is_numeric(unsigned short);
-    BOOST_dynamic_bitset_is_numeric(unsigned int);
-    BOOST_dynamic_bitset_is_numeric(unsigned long);
-
-#if defined(BOOST_HAS_LONG_LONG)
-    BOOST_dynamic_bitset_is_numeric(::boost::long_long_type);
-    BOOST_dynamic_bitset_is_numeric(::boost::ulong_long_type);
-#endif
-
-    // intentionally omitted
-    //BOOST_dynamic_bitset_is_numeric(float);
-    //BOOST_dynamic_bitset_is_numeric(double);
-    //BOOST_dynamic_bitset_is_numeric(long double);
-
-#undef BOOST_dynamic_bitset_is_numeric
-
-  } // dynamic_bitset_impl
-  } // namespace detail
-
-} // namespace boost
-
-#endif // include guard
-
--- a/include/boost/dynamic_bitset/dynamic_bitset.hpp
+++ b/include/boost/dynamic_bitset/dynamic_bitset.hpp
@@ -2,13 +2,6 @@
 //
 //   Copyright (c) 2001-2002 Chuck Allison and Jeremy Siek
 //        Copyright (c) 2003-2006, 2008 Gennaro Prota
-//             Copyright (c) 2014 Ahmed Charles
-//
-// Copyright (c) 2014 Glen Joseph Fernandes
-// (glenjofe@gmail.com)
-//
-// Copyright (c) 2014 Riccardo Marcangelo
-//             Copyright (c) 2018 Evgeny Shulgin
 //
 // Distributed under the Boost Software License, Version 1.0.
 //    (See accompanying file LICENSE_1_0.txt or copy at
@@ -23,7 +16,6 @@
 #include <string>
 #include <stdexcept>
 #include <algorithm>
-#include <iterator>     // used to implement append(Iter, Iter)
 #include <vector>
 #include <climits>      // for CHAR_BIT

@@ -42,15 +34,11 @@
 #endif

 #include "boost/dynamic_bitset_fwd.hpp"
-#include "boost/dynamic_bitset/detail/dynamic_bitset.hpp"
-#include "boost/dynamic_bitset/detail/lowest_bit.hpp"
-#include "boost/move/move.hpp"
-#include "boost/limits.hpp"
+#include "boost/detail/dynamic_bitset.hpp"
+#include "boost/detail/iterator.hpp" // used to implement append(Iter, Iter)
 #include "boost/static_assert.hpp"
-#include "boost/core/addressof.hpp"
-#include "boost/core/no_exceptions_support.hpp"
-#include "boost/throw_exception.hpp"
-#include "boost/functional/hash/hash.hpp"
+#include "boost/limits.hpp"
+#include "boost/pending/lowest_bit.hpp"


 namespace boost {
@@ -58,22 +46,21 @@ namespace boost {
 template <typename Block, typename Allocator>
 class dynamic_bitset
 {
-    // Portability note: member function templates are defined inside
-    // this class definition to avoid problems with VC++. Similarly,
-    // with the member functions of nested classes.
-    //
-    // [October 2008: the note above is mostly historical; new versions
-    // of VC++ are likely able to digest a more drinking form of the
-    // code; but changing it now is probably not worth the risks...]
+  // Portability note: member function templates are defined inside
+  // this class definition to avoid problems with VC++. Similarly,
+  // with the member functions of nested classes.
+  //
+  // [October 2008: the note above is mostly historical; new versions
+  // of VC++ are likely able to digest a more drinking form of the
+  // code; but changing it now is probably not worth the risks...]

-    BOOST_STATIC_ASSERT((bool)detail::dynamic_bitset_impl::allowed_block_type<Block>::value);
-    typedef std::vector<Block, Allocator> buffer_type;
+  BOOST_STATIC_ASSERT(detail::dynamic_bitset_impl::allowed_block_type<Block>::value);

 public:
    typedef Block block_type;
    typedef Allocator allocator_type;
    typedef std::size_t size_type;
-    typedef typename buffer_type::size_type block_width_type;
+    typedef block_type block_width_type;

    BOOST_STATIC_CONSTANT(block_width_type, bits_per_block = (std::numeric_limits<Block>::digits));
    BOOST_STATIC_CONSTANT(size_type, npos = static_cast<size_type>(-1));
@@ -89,7 +76,7 @@ public:


        // the one and only non-copy ctor
-        reference(block_type & b, block_width_type pos)
+        reference(block_type & b, block_type pos)
            :m_block(b),
             m_mask( (assert(pos < bits_per_block),
                      block_type(1) << pos )
@@ -128,10 +115,8 @@ public:
    typedef bool const_reference;

    // constructors, etc.
-    dynamic_bitset() : m_num_bits(0) {}
-
    explicit
-    dynamic_bitset(const Allocator& alloc);
+    dynamic_bitset(const Allocator& alloc = Allocator());

    explicit
    dynamic_bitset(size_type num_bits, unsigned long value = 0,
@@ -222,18 +207,12 @@ public:
    void swap(dynamic_bitset& b);
    dynamic_bitset& operator=(const dynamic_bitset& b);

-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    dynamic_bitset(dynamic_bitset&& src);
-    dynamic_bitset& operator=(dynamic_bitset&& src);
-#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
-
    allocator_type get_allocator() const;

    // size changing operations
    void resize(size_type num_bits, bool value = false);
    void clear();
    void push_back(bool bit);
-    void pop_back();
    void append(Block block);

    template <typename BlockInputIterator>
@@ -247,7 +226,7 @@ public:
    {
        assert(first != last);
        block_width_type r = count_extra_bits();
-        std::size_t d = std::distance(first, last);
+        std::size_t d = boost::detail::distance(first, last);
        m_bits.reserve(num_blocks() + d);
        if (r == 0) {
            for( ; first != last; ++first)
@@ -267,7 +246,7 @@ public:
    void append(BlockInputIterator first, BlockInputIterator last) // strong guarantee
    {
        if (first != last) {
-            typename std::iterator_traits<BlockInputIterator>::iterator_category cat;
+            typename detail::iterator_traits<BlockInputIterator>::iterator_category cat;
            m_append(first, last, cat);
        }
    }
@@ -284,22 +263,17 @@ public:
    dynamic_bitset operator>>(size_type n) const;

    // basic bit operations
-    dynamic_bitset& set(size_type n, size_type len, bool val /* = true */); // default would make it ambiguous
    dynamic_bitset& set(size_type n, bool val = true);
    dynamic_bitset& set();
-    dynamic_bitset& reset(size_type n, size_type len);
    dynamic_bitset& reset(size_type n);
    dynamic_bitset& reset();
-    dynamic_bitset& flip(size_type n, size_type len);
    dynamic_bitset& flip(size_type n);
    dynamic_bitset& flip();
    bool test(size_type n) const;
-    bool test_set(size_type n, bool val = true);
-    bool all() const;
    bool any() const;
    bool none() const;
    dynamic_bitset operator~() const;
-    size_type count() const BOOST_NOEXCEPT;
+    size_type count() const;

    // subscript
    reference operator[](size_type pos) {
@@ -309,13 +283,10 @@ public:

    unsigned long to_ulong() const;

-    size_type size() const BOOST_NOEXCEPT;
-    size_type num_blocks() const BOOST_NOEXCEPT;
-    size_type max_size() const BOOST_NOEXCEPT;
-    bool empty() const BOOST_NOEXCEPT;
-    size_type capacity() const BOOST_NOEXCEPT;
-    void reserve(size_type num_bits);
-    void shrink_to_fit();
+    size_type size() const;
+    size_type num_blocks() const;
+    size_type max_size() const;
+    bool empty() const;

    bool is_subset_of(const dynamic_bitset& a) const;
    bool is_proper_subset_of(const dynamic_bitset& a) const;
@@ -336,10 +307,6 @@ public:
    friend bool operator<(const dynamic_bitset<B, A>& a,
                          const dynamic_bitset<B, A>& b);

-    template <typename B, typename A>
-    friend bool oplessthan(const dynamic_bitset<B, A>& a,
-                          const dynamic_bitset<B, A>& b);
-

    template <typename B, typename A, typename BlockOutputIterator>
    friend void to_block_range(const dynamic_bitset<B, A>& b,
@@ -357,76 +324,23 @@ public:
    template <typename B, typename A, typename stringT>
    friend void to_string_helper(const dynamic_bitset<B, A> & b, stringT & s, bool dump_all);

-    template <typename B, typename A>
-    friend std::size_t hash_value(const dynamic_bitset<B, A>& a);
+
 #endif

-public:
-    // forward declaration for optional zero-copy serialization support
-    class serialize_impl;
-    friend class serialize_impl;

 private:
    BOOST_STATIC_CONSTANT(block_width_type, ulong_width = std::numeric_limits<unsigned long>::digits);
+    typedef std::vector<block_type, allocator_type> buffer_type;

-    dynamic_bitset& range_operation(size_type pos, size_type len,
-        Block (*partial_block_operation)(Block, size_type, size_type),
-        Block (*full_block_operation)(Block));
    void m_zero_unused_bits();
    bool m_check_invariants() const;

-    static bool m_not_empty(Block x){ return x != Block(0); };
    size_type m_do_find_from(size_type first_block) const;

-    block_width_type count_extra_bits() const BOOST_NOEXCEPT { return bit_index(size()); }
-    static size_type block_index(size_type pos) BOOST_NOEXCEPT { return pos / bits_per_block; }
-    static block_width_type bit_index(size_type pos) BOOST_NOEXCEPT { return static_cast<block_width_type>(pos % bits_per_block); }
-    static Block bit_mask(size_type pos) BOOST_NOEXCEPT { return Block(1) << bit_index(pos); }
-    static Block bit_mask(size_type first, size_type last) BOOST_NOEXCEPT
-    {
-        Block res = (last == bits_per_block - 1)
-            ? detail::dynamic_bitset_impl::max_limit<Block>::value
-            : ((Block(1) << (last + 1)) - 1);
-        res ^= (Block(1) << first) - 1;
-        return res;
-    }
-    static Block set_block_bits(Block block, size_type first,
-        size_type last, bool val) BOOST_NOEXCEPT
-    {
-        if (val)
-            return block | bit_mask(first, last);
-        else
-            return block & static_cast<Block>(~bit_mask(first, last));
-    }
-
-    // Functions for operations on ranges
-    inline static Block set_block_partial(Block block, size_type first,
-        size_type last) BOOST_NOEXCEPT
-    {
-        return set_block_bits(block, first, last, true);
-    }
-    inline static Block set_block_full(Block) BOOST_NOEXCEPT
-    {
-        return detail::dynamic_bitset_impl::max_limit<Block>::value;
-    }
-    inline static Block reset_block_partial(Block block, size_type first,
-        size_type last) BOOST_NOEXCEPT
-    {
-        return set_block_bits(block, first, last, false);
-    }
-    inline static Block reset_block_full(Block) BOOST_NOEXCEPT
-    {
-        return 0;
-    }
-    inline static Block flip_block_partial(Block block, size_type first,
-        size_type last) BOOST_NOEXCEPT
-    {
-        return block ^ bit_mask(first, last);
-    }
-    inline static Block flip_block_full(Block block) BOOST_NOEXCEPT
-    {
-        return ~block;
-    }
+    block_width_type count_extra_bits() const { return bit_index(size()); }
+    static size_type block_index(size_type pos) { return pos / bits_per_block; }
+    static block_width_type bit_index(size_type pos) { return static_cast<block_width_type>(pos % bits_per_block); }
+    static Block bit_mask(size_type pos) { return Block(1) << bit_index(pos); }

    template <typename CharT, typename Traits, typename Alloc>
    void init_from_string(const std::basic_string<CharT, Traits, Alloc>& s,
@@ -719,34 +633,6 @@ operator=(const dynamic_bitset<Block, Allocator>& b)
    return *this;
 }

-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-
-template <typename Block, typename Allocator>
-inline dynamic_bitset<Block, Allocator>::
-dynamic_bitset(dynamic_bitset<Block, Allocator>&& b)
-  : m_bits(boost::move(b.m_bits)), m_num_bits(boost::move(b.m_num_bits))
-{
-    // Required so that assert(m_check_invariants()); works.
-    assert((b.m_bits = buffer_type()).empty());
-    b.m_num_bits = 0;
-}
-
-template <typename Block, typename Allocator>
-inline dynamic_bitset<Block, Allocator>& dynamic_bitset<Block, Allocator>::
-operator=(dynamic_bitset<Block, Allocator>&& b)
-{
-    if (boost::addressof(b) == this) { return *this; }
-
-    m_bits = boost::move(b.m_bits);
-    m_num_bits = boost::move(b.m_num_bits);
-    // Required so that assert(m_check_invariants()); works.
-    assert((b.m_bits = buffer_type()).empty());
-    b.m_num_bits = 0;
-    return *this;
-}
-
-#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
-
 template <typename Block, typename Allocator>
 inline typename dynamic_bitset<Block, Allocator>::allocator_type
 dynamic_bitset<Block, Allocator>::get_allocator() const
@@ -765,7 +651,7 @@ resize(size_type num_bits, bool value) // strong guarantee
  const size_type old_num_blocks = num_blocks();
  const size_type required_blocks = calc_num_blocks(num_bits);

-  const block_type v = value? detail::dynamic_bitset_impl::max_limit<Block>::value : Block(0);
+  const block_type v = value? ~Block(0) : Block(0);

  if (required_blocks != old_num_blocks) {
    m_bits.resize(required_blocks, v); // s.g. (copy)
@@ -784,7 +670,7 @@ resize(size_type num_bits, bool value) // strong guarantee

  if (value && (num_bits > m_num_bits)) {

-    const block_width_type extra_bits = count_extra_bits();
+    const size_type extra_bits = count_extra_bits();
    if (extra_bits) {
        assert(old_num_blocks >= 1 && old_num_blocks <= m_bits.size());

@@ -817,22 +703,6 @@ push_back(bool bit)
  set(sz, bit);
 }

-template <typename Block, typename Allocator>
-void dynamic_bitset<Block, Allocator>::
-pop_back()
-{
-  const size_type old_num_blocks = num_blocks();
-  const size_type required_blocks = calc_num_blocks(m_num_bits - 1);
-
-  if (required_blocks != old_num_blocks) {
-    m_bits.pop_back();
-  }
-
-  --m_num_bits;
-  m_zero_unused_bits();
-}
-
-
 template <typename Block, typename Allocator>
 void dynamic_bitset<Block, Allocator>::
 append(Block value) // strong guarantee
@@ -937,7 +807,7 @@ dynamic_bitset<Block, Allocator>::operator<<=(size_type n)
        }

        // zero out div blocks at the less significant end
-        std::fill_n(m_bits.begin(), div, static_cast<block_type>(0));
+        std::fill_n(b, div, static_cast<block_type>(0));

        // zero out any 1 bit that flowed into the unused part
        m_zero_unused_bits(); // thanks to Lester Gong
@@ -990,7 +860,7 @@ dynamic_bitset<B, A> & dynamic_bitset<B, A>::operator>>=(size_type n) {


        // div blocks are zero filled at the most significant end
-        std::fill_n(m_bits.begin() + (num_blocks()-div), div, static_cast<block_type>(0));
+        std::fill_n(b + (num_blocks()-div), div, static_cast<block_type>(0));
    }

    return *this;
@@ -1017,17 +887,6 @@ dynamic_bitset<Block, Allocator>::operator>>(size_type n) const
 //-----------------------------------------------------------------------------
 // basic bit operations

-template <typename Block, typename Allocator>
-dynamic_bitset<Block, Allocator>&
-dynamic_bitset<Block, Allocator>::set(size_type pos,
-        size_type len, bool val)
-{
-    if (val)
-        return range_operation(pos, len, set_block_partial, set_block_full);
-    else
-        return range_operation(pos, len, reset_block_partial, reset_block_full);
-}
-
 template <typename Block, typename Allocator>
 dynamic_bitset<Block, Allocator>&
 dynamic_bitset<Block, Allocator>::set(size_type pos, bool val)
@@ -1046,18 +905,11 @@ template <typename Block, typename Allocator>
 dynamic_bitset<Block, Allocator>&
 dynamic_bitset<Block, Allocator>::set()
 {
-  std::fill(m_bits.begin(), m_bits.end(), detail::dynamic_bitset_impl::max_limit<Block>::value);
+  std::fill(m_bits.begin(), m_bits.end(), ~Block(0));
  m_zero_unused_bits();
  return *this;
 }

-template <typename Block, typename Allocator>
-inline dynamic_bitset<Block, Allocator>&
-dynamic_bitset<Block, Allocator>::reset(size_type pos, size_type len)
-{
-    return range_operation(pos, len, reset_block_partial, reset_block_full);
-}
-
 template <typename Block, typename Allocator>
 dynamic_bitset<Block, Allocator>&
 dynamic_bitset<Block, Allocator>::reset(size_type pos)
@@ -1082,13 +934,6 @@ dynamic_bitset<Block, Allocator>::reset()
  return *this;
 }

-template <typename Block, typename Allocator>
-dynamic_bitset<Block, Allocator>&
-dynamic_bitset<Block, Allocator>::flip(size_type pos, size_type len)
-{
-    return range_operation(pos, len, flip_block_partial, flip_block_full);
-}
-
 template <typename Block, typename Allocator>
 dynamic_bitset<Block, Allocator>&
 dynamic_bitset<Block, Allocator>::flip(size_type pos)
@@ -1121,46 +966,6 @@ bool dynamic_bitset<Block, Allocator>::test(size_type pos) const
    return m_unchecked_test(pos);
 }

-template <typename Block, typename Allocator>
-bool dynamic_bitset<Block, Allocator>::test_set(size_type pos, bool val)
-{
-    bool const b = test(pos);
-    if (b != val) {
-        set(pos, val);
-    }
-    return b;
-}
-
-template <typename Block, typename Allocator>
-bool dynamic_bitset<Block, Allocator>::all() const
-{
-    if (empty()) {
-        return true;
-    }
-
-    const block_width_type extra_bits = count_extra_bits();
-    block_type const all_ones = detail::dynamic_bitset_impl::max_limit<Block>::value;
-
-    if (extra_bits == 0) {
-        for (size_type i = 0, e = num_blocks(); i < e; ++i) {
-            if (m_bits[i] != all_ones) {
-                return false;
-            }
-        }
-    } else {
-        for (size_type i = 0, e = num_blocks() - 1; i < e; ++i) {
-            if (m_bits[i] != all_ones) {
-                return false;
-            }
-        }
-        const block_type mask = (block_type(1) << extra_bits) - 1;
-        if (m_highest_block() != mask) {
-            return false;
-        }
-    }
-    return true;
-}
-
 template <typename Block, typename Allocator>
 bool dynamic_bitset<Block, Allocator>::any() const
 {
@@ -1187,7 +992,7 @@ dynamic_bitset<Block, Allocator>::operator~() const

 template <typename Block, typename Allocator>
 typename dynamic_bitset<Block, Allocator>::size_type
-dynamic_bitset<Block, Allocator>::count() const BOOST_NOEXCEPT
+dynamic_bitset<Block, Allocator>::count() const
 {
    using detail::dynamic_bitset_impl::table_width;
    using detail::dynamic_bitset_impl::access_by_bytes;
@@ -1208,17 +1013,7 @@ dynamic_bitset<Block, Allocator>::count() const BOOST_NOEXCEPT

    enum { enough_table_width = table_width >= CHAR_BIT };

-#if ((defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)) || (defined(__clang__) && defined(__c2__)) || (defined(BOOST_INTEL) && defined(_MSC_VER))) && (defined(_M_IX86) || defined(_M_X64))
-    // Windows popcount is effective starting from the unsigned short type
-    enum { uneffective_popcount = sizeof(Block) < sizeof(unsigned short) };
-#elif defined(BOOST_GCC) || defined(__clang__) || (defined(BOOST_INTEL) && defined(__GNUC__))
-    // GCC popcount is effective starting from the unsigned int type
-    enum { uneffective_popcount = sizeof(Block) < sizeof(unsigned int) };
-#else
-    enum { uneffective_popcount = true };
-#endif
-
-    enum { mode = (no_padding && enough_table_width && uneffective_popcount)
+    enum { mode = (no_padding && enough_table_width)
                          ? access_by_bytes
                          : access_by_blocks };

@@ -1306,17 +1101,17 @@ to_ulong() const
  // Check for overflows. This may be a performance burden on very
  // large bitsets but is required by the specification, sorry
  if (find_next(ulong_width - 1) != npos)
-    BOOST_THROW_EXCEPTION(std::overflow_error("boost::dynamic_bitset::to_ulong overflow"));
+    throw std::overflow_error("boost::dynamic_bitset::to_ulong overflow");


  // Ok, from now on we can be sure there's no "on" bit
  // beyond the "allowed" positions
  typedef unsigned long result_type;

-  const size_type maximum_size =
+  const size_type max_size =
            (std::min)(m_num_bits, static_cast<size_type>(ulong_width));

-  const size_type last_block = block_index( maximum_size - 1 );
+  const size_type last_block = block_index( max_size - 1 );

  assert((last_block * bits_per_block) < static_cast<size_type>(ulong_width));

@@ -1331,21 +1126,21 @@ to_ulong() const

 template <typename Block, typename Allocator>
 inline typename dynamic_bitset<Block, Allocator>::size_type
-dynamic_bitset<Block, Allocator>::size() const BOOST_NOEXCEPT
+dynamic_bitset<Block, Allocator>::size() const
 {
    return m_num_bits;
 }

 template <typename Block, typename Allocator>
 inline typename dynamic_bitset<Block, Allocator>::size_type
-dynamic_bitset<Block, Allocator>::num_blocks() const BOOST_NOEXCEPT
+dynamic_bitset<Block, Allocator>::num_blocks() const
 {
    return m_bits.size();
 }

 template <typename Block, typename Allocator>
 inline typename dynamic_bitset<Block, Allocator>::size_type
-dynamic_bitset<Block, Allocator>::max_size() const BOOST_NOEXCEPT
+dynamic_bitset<Block, Allocator>::max_size() const
 {
    // Semantics of vector<>::max_size() aren't very clear
    // (see lib issue 197) and many library implementations
@@ -1366,32 +1161,11 @@ dynamic_bitset<Block, Allocator>::max_size() const BOOST_NOEXCEPT
 }

 template <typename Block, typename Allocator>
-inline bool dynamic_bitset<Block, Allocator>::empty() const BOOST_NOEXCEPT
+inline bool dynamic_bitset<Block, Allocator>::empty() const
 {
  return size() == 0;
 }

-template <typename Block, typename Allocator>
-inline typename dynamic_bitset<Block, Allocator>::size_type
-dynamic_bitset<Block, Allocator>::capacity() const BOOST_NOEXCEPT
-{
-    return m_bits.capacity() * bits_per_block;
-}
-
-template <typename Block, typename Allocator>
-inline void dynamic_bitset<Block, Allocator>::reserve(size_type num_bits)
-{
-    m_bits.reserve(calc_num_blocks(num_bits));
-}
-
-template <typename Block, typename Allocator>
-void dynamic_bitset<Block, Allocator>::shrink_to_fit()
-{
-    if (m_bits.size() < m_bits.capacity()) {
-      buffer_type(m_bits).swap(m_bits);
-    }
-}
-
 template <typename Block, typename Allocator>
 bool dynamic_bitset<Block, Allocator>::
 is_subset_of(const dynamic_bitset<Block, Allocator>& a) const
@@ -1439,22 +1213,25 @@ bool dynamic_bitset<Block, Allocator>::intersects(const dynamic_bitset & b) cons
 // --------------------------------
 // lookup

+
 // look for the first bit "on", starting
 // from the block with index first_block
 //
-
 template <typename Block, typename Allocator>
 typename dynamic_bitset<Block, Allocator>::size_type
 dynamic_bitset<Block, Allocator>::m_do_find_from(size_type first_block) const
 {
+    size_type i = first_block;

-    size_type i = std::distance(m_bits.begin(),
-        std::find_if(m_bits.begin() + first_block, m_bits.end(), m_not_empty) );
+    // skip null blocks
+    while (i < num_blocks() && m_bits[i] == 0)
+        ++i;

    if (i >= num_blocks())
        return npos; // not found

-    return i * bits_per_block + static_cast<size_type>(detail::lowest_bit(m_bits[i]));
+    return i * bits_per_block + boost::lowest_bit(m_bits[i]);
+
 }


@@ -1480,11 +1257,11 @@ dynamic_bitset<Block, Allocator>::find_next(size_type pos) const
    const size_type blk = block_index(pos);
    const block_width_type ind = bit_index(pos);

-    // shift bits upto one immediately after current
-    const Block fore = m_bits[blk] >> ind;
+    // mask out bits before pos
+    const Block fore = m_bits[blk] & ( ~Block(0) << ind );

    return fore?
-        pos + static_cast<size_type>(detail::lowest_bit(fore))
+        blk * bits_per_block + lowest_bit(fore)
        :
        m_do_find_from(blk + 1);

@@ -1514,95 +1291,23 @@ template <typename Block, typename Allocator>
 bool operator<(const dynamic_bitset<Block, Allocator>& a,
               const dynamic_bitset<Block, Allocator>& b)
 {
-//    assert(a.size() == b.size());
+    assert(a.size() == b.size());
+    typedef typename dynamic_bitset<Block, Allocator>::size_type size_type;

-    typedef BOOST_DEDUCED_TYPENAME dynamic_bitset<Block, Allocator>::size_type size_type;
-    
-    size_type asize(a.size());
-    size_type bsize(b.size());
+    //if (a.size() == 0)
+    //  return false;

-    if (!bsize)
-        {
-        return false;
-        }
-    else if (!asize)
-        {
+    // Since we are storing the most significant bit
+    // at pos == size() - 1, we need to do the comparisons in reverse.
+    //
+    for (size_type ii = a.num_blocks(); ii > 0; --ii) {
+      size_type i = ii-1;
+      if (a.m_bits[i] < b.m_bits[i])
        return true;
-        }
-    else if (asize == bsize)
-        {
-        for (size_type ii = a.num_blocks(); ii > 0; --ii) 
-            {
-            size_type i = ii-1;
-            if (a.m_bits[i] < b.m_bits[i])
-                return true;
-            else if (a.m_bits[i] > b.m_bits[i])
-                return false;
-            }
+      else if (a.m_bits[i] > b.m_bits[i])
        return false;
-        }
-    else
-        {
-        
-        size_type leqsize(std::min BOOST_PREVENT_MACRO_SUBSTITUTION(asize,bsize));
-    
-        for (size_type ii = 0; ii < leqsize; ++ii,--asize,--bsize)
-            {
-            size_type i = asize-1;
-            size_type j = bsize-1;
-            if (a[i] < b[j])
-                return true;
-            else if (a[i] > b[j])
-                return false;
-            }
-        return (a.size() < b.size());
-        }
-}
-
-template <typename Block, typename Allocator>
-bool oplessthan(const dynamic_bitset<Block, Allocator>& a,
-               const dynamic_bitset<Block, Allocator>& b)
-{
-//    assert(a.size() == b.size());
-
-    typedef BOOST_DEDUCED_TYPENAME dynamic_bitset<Block, Allocator>::size_type size_type;
-    
-    size_type asize(a.num_blocks());
-    size_type bsize(b.num_blocks());
-    assert(asize == 3);
-    assert(bsize == 4);
-
-    if (!bsize)
-        {
-        return false;
-        }
-    else if (!asize)
-        {
-        return true;
-        }
-    else
-        {
-        
-        size_type leqsize(std::min BOOST_PREVENT_MACRO_SUBSTITUTION(asize,bsize));
-        assert(leqsize == 3);
-    
-        //if (a.size() == 0)
-        //  return false;
-    
-        // Since we are storing the most significant bit
-        // at pos == size() - 1, we need to do the comparisons in reverse.
-        //
-        for (size_type ii = 0; ii < leqsize; ++ii,--asize,--bsize)
-            {
-            size_type i = asize-1;
-            size_type j = bsize-1;
-            if (a.m_bits[i] < b.m_bits[j])
-                return true;
-            else if (a.m_bits[i] > b.m_bits[j])
-                return false;
-            }
-        return (a.num_blocks() < b.num_blocks());
-        }
+    }
+    return false;
 }

 template <typename Block, typename Allocator>
@@ -1626,17 +1331,6 @@ inline bool operator>=(const dynamic_bitset<Block, Allocator>& a,
    return !(a < b);
 }

-//-----------------------------------------------------------------------------
-// hash operations
-
-template <typename Block, typename Allocator>
-inline std::size_t hash_value(const dynamic_bitset<Block, Allocator>& a)
-{
-    std::size_t res = hash_value(a.m_num_bits);
-    boost::hash_combine(res, a.m_bits);
-    return res;
-}
-
 //-----------------------------------------------------------------------------
 // stream operations

@@ -1728,20 +1422,19 @@ operator<<(std::basic_ostream<Ch, Tr>& os,
        const Ch zero = BOOST_DYNAMIC_BITSET_WIDEN_CHAR(fac, '0');
        const Ch one  = BOOST_DYNAMIC_BITSET_WIDEN_CHAR(fac, '1');

-        BOOST_TRY {
+        try {

-            typedef typename dynamic_bitset<Block, Alloc>::size_type bitset_size_type;
+            typedef typename dynamic_bitset<Block, Alloc>::size_type bitsetsize_type;
            typedef basic_streambuf<Ch, Tr> buffer_type;

            buffer_type * buf = os.rdbuf();
-            // careful: os.width() is signed (and can be < 0)
-            const bitset_size_type width = (os.width() <= 0) ? 0 : static_cast<bitset_size_type>(os.width());
-            streamsize npad = (width <= b.size()) ? 0 : width - b.size();
+            size_t npad = os.width() <= 0  // careful: os.width() is signed (and can be < 0)
+                || (bitsetsize_type) os.width() <= b.size()? 0 : os.width() - b.size();

            const Ch fill_char = os.fill();
            const ios_base::fmtflags adjustfield = os.flags() & ios_base::adjustfield;

-            // if needed fill at left; pad is decreased along the way
+            // if needed fill at left; pad is decresed along the way
            if (adjustfield != ios_base::left) {
                for (; 0 < npad; --npad)
                    if (Tr::eq_int_type(Tr::eof(), buf->sputc(fill_char))) {
@@ -1752,7 +1445,7 @@ operator<<(std::basic_ostream<Ch, Tr>& os,

            if (err == ok) {
                // output the bitset
-                for (bitset_size_type i = b.size(); 0 < i; --i) {
+                for (bitsetsize_type i = b.size(); 0 < i; --i) {
                    typename buffer_type::int_type
                        ret = buf->sputc(b.test(i-1)? one : zero);
                    if (Tr::eq_int_type(Tr::eof(), ret)) {
@@ -1775,14 +1468,13 @@ operator<<(std::basic_ostream<Ch, Tr>& os,

            os.width(0);

-        } BOOST_CATCH (...) { // see std 27.6.1.1/4
+        } catch (...) { // see std 27.6.1.1/4
            bool rethrow = false;
-            BOOST_TRY { os.setstate(ios_base::failbit); } BOOST_CATCH (...) { rethrow = true; } BOOST_CATCH_END
+            try { os.setstate(ios_base::failbit); } catch (...) { rethrow = true; }

            if (rethrow)
-                BOOST_RETHROW;
+                throw;
        }
-        BOOST_CATCH_END
    }

    if(err != ok)
@@ -1828,7 +1520,7 @@ operator>>(std::istream& is, dynamic_bitset<Block, Alloc>& b)

        const std::streamsize w = is.width();
        const size_type limit = w > 0 && static_cast<size_type>(w) < b.max_size()
-                                                         ? static_cast<size_type>(w) : b.max_size();
+                                                         ? w : b.max_size();
        typename bitset_type::bit_appender appender(b);
        std::streambuf * buf = is.rdbuf();
        for(int c = buf->sgetc(); appender.get_count() < limit; c = buf->snextc() ) {
@@ -1841,14 +1533,13 @@ operator>>(std::istream& is, dynamic_bitset<Block, Alloc>& b)
                break; // non digit character

            else {
-                BOOST_TRY {
+                try {
                    appender.do_append(char(c) == '1');
                }
-                BOOST_CATCH(...) {
+                catch(...) {
                    is.setstate(std::ios::failbit); // assume this can't throw
-                    BOOST_RETHROW;
+                    throw;
                }
-                BOOST_CATCH_END
            }

        } // for
@@ -1877,7 +1568,7 @@ operator>>(std::basic_istream<Ch, Tr>& is, dynamic_bitset<Block, Alloc>& b)

    const streamsize w = is.width();
    const size_type limit = 0 < w && static_cast<size_type>(w) < b.max_size()?
-                                         static_cast<size_type>(w) : b.max_size();
+                                         w : b.max_size();

    ios_base::iostate err = ios_base::goodbit;
    typename basic_istream<Ch, Tr>::sentry cerberos(is); // skips whitespaces
@@ -1889,7 +1580,7 @@ operator>>(std::basic_istream<Ch, Tr>& is, dynamic_bitset<Block, Alloc>& b)
        const Ch one  = BOOST_DYNAMIC_BITSET_WIDEN_CHAR(fac, '1');

        b.clear();
-        BOOST_TRY {
+        try {
            typename bitset_type::bit_appender appender(b);
            basic_streambuf <Ch, Tr> * buf = is.rdbuf();
            typename Tr::int_type c = buf->sgetc();
@@ -1912,7 +1603,7 @@ operator>>(std::basic_istream<Ch, Tr>& is, dynamic_bitset<Block, Alloc>& b)

            } // for
        }
-        BOOST_CATCH (...) {
+        catch (...) {
            // catches from stream buf, or from vector:
            //
            // bits_stored bits have been extracted and stored, and
@@ -1920,15 +1611,13 @@ operator>>(std::basic_istream<Ch, Tr>& is, dynamic_bitset<Block, Alloc>& b)
            // append to the underlying vector (out of memory)

            bool rethrow = false;   // see std 27.6.1.1/4
-            BOOST_TRY { is.setstate(ios_base::badbit); }
-            BOOST_CATCH(...) { rethrow = true; }
-            BOOST_CATCH_END
+            try { is.setstate(ios_base::badbit); }
+            catch(...) { rethrow = true; }

            if (rethrow)
-                BOOST_RETHROW;
+                throw;

        }
-        BOOST_CATCH_END
    }

    is.width(0);
@@ -2005,7 +1694,7 @@ inline typename dynamic_bitset<Block, Allocator>::size_type
 dynamic_bitset<Block, Allocator>::calc_num_blocks(size_type num_bits)
 {
    return num_bits / bits_per_block
-           + static_cast<size_type>( num_bits % bits_per_block != 0 );
+           + static_cast<int>( num_bits % bits_per_block != 0 );
 }

 // gives a reference to the highest block
@@ -2026,63 +1715,6 @@ inline const Block& dynamic_bitset<Block, Allocator>::m_highest_block() const
    return m_bits.back();
 }

-template <typename Block, typename Allocator>
-dynamic_bitset<Block, Allocator>& dynamic_bitset<Block, Allocator>::range_operation(
-    size_type pos, size_type len,
-    Block (*partial_block_operation)(Block, size_type, size_type),
-    Block (*full_block_operation)(Block))
-{
-    assert(pos + len <= m_num_bits);
-
-    // Do nothing in case of zero length
-    if (!len)
-        return *this;
-
-    // Use an additional asserts in order to detect size_type overflow
-    // For example: pos = 10, len = size_type_limit - 2, pos + len = 7
-    // In case of overflow, 'pos + len' is always smaller than 'len'
-    assert(pos + len >= len);
-
-    // Start and end blocks of the [pos; pos + len - 1] sequence
-    const size_type first_block = block_index(pos);
-    const size_type last_block = block_index(pos + len - 1);
-
-    const size_type first_bit_index = bit_index(pos);
-    const size_type last_bit_index = bit_index(pos + len - 1);
-
-    if (first_block == last_block) {
-        // Filling only a sub-block of a block
-        m_bits[first_block] = partial_block_operation(m_bits[first_block],
-            first_bit_index, last_bit_index);
-    } else {
-        // Check if the corner blocks won't be fully filled with 'val'
-        const size_type first_block_shift = bit_index(pos) ? 1 : 0;
-        const size_type last_block_shift = (bit_index(pos + len - 1)
-            == bits_per_block - 1) ? 0 : 1;
-
-        // Blocks that will be filled with ~0 or 0 at once
-        const size_type first_full_block = first_block + first_block_shift;
-        const size_type last_full_block = last_block - last_block_shift;
-
-        for (size_type i = first_full_block; i <= last_full_block; ++i) {
-            m_bits[i] = full_block_operation(m_bits[i]);
-        }
-
-        // Fill the first block from the 'first' bit index to the end
-        if (first_block_shift) {
-            m_bits[first_block] = partial_block_operation(m_bits[first_block],
-                first_bit_index, bits_per_block - 1);
-        }
-
-        // Fill the last block from the start to the 'last' bit index
-        if (last_block_shift) {
-            m_bits[last_block] = partial_block_operation(m_bits[last_block],
-                0, last_bit_index);
-        }
-    }
-
-    return *this;
-}

 // If size() is not a multiple of bits_per_block
 // then not all the bits in the last block are used.
@@ -2098,7 +1730,8 @@ inline void dynamic_bitset<Block, Allocator>::m_zero_unused_bits()
    const block_width_type extra_bits = count_extra_bits();

    if (extra_bits != 0)
-        m_highest_block() &= (Block(1) << extra_bits) - 1;
+        m_highest_block() &= ~(~static_cast<Block>(0) << extra_bits);
+
 }

 // check class invariants
@@ -2107,7 +1740,7 @@ bool dynamic_bitset<Block, Allocator>::m_check_invariants() const
 {
    const block_width_type extra_bits = count_extra_bits();
    if (extra_bits > 0) {
-        const block_type mask = detail::dynamic_bitset_impl::max_limit<Block>::value << extra_bits;
+        block_type const mask = (~static_cast<Block>(0) << extra_bits);
        if ((m_highest_block() & mask) != 0)
            return false;
    }
@@ -2121,26 +1754,8 @@ bool dynamic_bitset<Block, Allocator>::m_check_invariants() const

 } // namespace boost

-#undef BOOST_BITSET_CHAR

-// std::hash support
-#if !defined(BOOST_NO_CXX11_HDR_FUNCTIONAL) && !defined(BOOST_DYNAMIC_BITSET_NO_STD_HASH)
-#include <functional>
-namespace std
-{
-    template<typename Block, typename Allocator>
-    struct hash< boost::dynamic_bitset<Block, Allocator> >
-    {
-        typedef boost::dynamic_bitset<Block, Allocator> argument_type;
-        typedef std::size_t result_type;
-        result_type operator()(const argument_type& a) const BOOST_NOEXCEPT
-        {
-            boost::hash<argument_type> hasher;
-            return hasher(a);
-        }
-    };
-}
-#endif
+#undef BOOST_BITSET_CHAR

 #endif // include guard

--- a/include/boost/dynamic_bitset/serialization.hpp
+++ b/include/boost/dynamic_bitset/serialization.hpp
@@ -1,46 +0,0 @@
-// -----------------------------------------------------------
-//
-// Copyright (c) 2015 Seth Heeren
-//
-// 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)
-//
-// -----------------------------------------------------------
-
-#ifndef BOOST_DYNAMIC_BITSET_SERIALIZATION_HPP
-#define BOOST_DYNAMIC_BITSET_SERIALIZATION_HPP
-
-#include "boost/dynamic_bitset/dynamic_bitset.hpp"
-#include <boost/core/nvp.hpp>
-
-namespace boost {
-
-    // implementation for optional zero-copy serialization support
-    template <typename Block, typename Allocator>
-        class dynamic_bitset<Block, Allocator>::serialize_impl
-        {
-            public:
-                template <typename Ar> 
-                static void serialize(Ar& ar, dynamic_bitset<Block, Allocator>& bs, unsigned) {
-                    ar & boost::make_nvp("m_num_bits", bs.m_num_bits)
-                       & boost::make_nvp("m_bits", bs.m_bits);
-                }
-        };
-
-}
-
-// ADL hook to Boost Serialization library
-namespace boost {
-    namespace serialization {
-
-        template <typename Ar, typename Block, typename Allocator>
-            void serialize(Ar& ar, dynamic_bitset<Block, Allocator>& bs, unsigned version) {
-                dynamic_bitset<Block, Allocator>::serialize_impl::serialize(ar, bs, version);
-            }
-
-    } // namespace serialization
-} // namespace boost
-
-#endif // include guard
-
--- a/include/boost/dynamic_bitset/detail/lowest_bit.hpp
+++ b/include/boost/dynamic_bitset/detail/lowest_bit.hpp
@@ -14,16 +14,16 @@
 #ifndef BOOST_LOWEST_BIT_HPP_GP_20030301
 #define BOOST_LOWEST_BIT_HPP_GP_20030301

-#include "boost/integer/integer_log2.hpp"
-#include "boost/assert.hpp"
+#include <assert.h>
+#include "boost/pending/integer_log2.hpp"
+

 namespace boost {
-namespace detail {

    template <typename T>
    int lowest_bit(T x) {

-        BOOST_ASSERT(x >= 1); // PRE
+        assert(x >= 1); // PRE

        // clear all bits on except the rightmost one,
        // then calculate the logarithm base 2
@@ -32,7 +32,7 @@ namespace detail {

    }

-}
+
 }


--- a/meta/libraries.json
+++ b/meta/libraries.json
@@ -1,16 +0,0 @@
-{
-    "key": "dynamic_bitset",
-    "name": "Dynamic Bitset",
-    "authors": [
-        "Jeremy Siek",
-        "Chuck Allison"
-    ],
-    "description": "The dynamic_bitset class represents a set of bits. It provides accesses to the value of individual bits via an operator[] and provides all of the bitwise operators that one can apply to builtin integers, such as operator& and operator<<. The number of bits in the set is specified at runtime via a parameter to the constructor of the dynamic_bitset.",
-    "documentation": "dynamic_bitset.html",
-    "category": [
-        "Containers"
-    ],
-    "maintainers": [
-        "Jeremy Siek <jeremy.siek -at- gmail.com>"
-    ]
-}
--- a/module.cmake
+++ b/module.cmake
@@ -0,0 +1 @@
+boost_module(dynamic_bitset DEPENDS detail static_assert)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -0,0 +1,13 @@
+#
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
+boost_additional_test_dependencies(dynamic_bitset BOOST_DEPENDS test config)
+
+
+boost_test_run(dyn_bitset_unit_tests1 ../dyn_bitset_unit_tests1.cpp)
+boost_test_run(dyn_bitset_unit_tests2 ../dyn_bitset_unit_tests2.cpp)
+boost_test_run(dyn_bitset_unit_tests3 ../dyn_bitset_unit_tests3.cpp)
+boost_test_run(dyn_bitset_unit_tests4 ../dyn_bitset_unit_tests4.cpp)
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,42 +0,0 @@
-#
-#              Copyright Vladimir Prus 2004
-#
-# 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)
-#
-
-import os ;
-
-# import rules for testing conditional on config file variables
-import ../../config/checks/config : requires ;
-
-test-suite dynamic_bitset :
-
-    [ run dyn_bitset_unit_tests1.cpp : : : <library>/boost/system//boost_system ]
-    [ run dyn_bitset_unit_tests2.cpp : : : <library>/boost/system//boost_system ]
-    [ run dyn_bitset_unit_tests3.cpp : : : <library>/boost/system//boost_system ]
-    [ run dyn_bitset_unit_tests4.cpp : : : <library>/boost/filesystem//boost_filesystem
-                                           <library>/boost/system//boost_system ]
-    [ run test_ambiguous_set.cpp ]
-    [ run test_lowest_bit.cpp ]
-
-    [ run test_boost_hash.cpp ]
-    [ run test_std_hash.cpp          : : : [ requires cxx11_hdr_unordered_set ] ] 
-
-    [ compile-fail test_std_hash.cpp : [ requires cxx11_hdr_unordered_set ]
-                                       <define>BOOST_DYNAMIC_BITSET_NO_STD_HASH
-                                     : test_std_hash_disabled ]
-    ;
-
-# due to https://github.com/boostorg/serialization/issues/108
-if ! [ os.environ UBSAN_OPTIONS ]
-{
-  test-suite dynamic_bitset_serialization :
-
-    [ run dyn_bitset_unit_tests5.cpp
-       : : : <define>_SCL_SECURE_NO_WARNINGS=1
-             <library>/boost/serialization//boost_serialization
-             <library>/boost/system//boost_system ]
-    ;
-}
--- a/test/dyn_bitset_unit_tests5.cpp
+++ b/test/dyn_bitset_unit_tests5.cpp
@@ -1,112 +0,0 @@
-// -----------------------------------------------------------
-//              Copyright (c) 2001 Jeremy Siek
-//           Copyright (c) 2003-2006 Gennaro Prota
-//
-// Copyright (c) 2015 Seth Heeren
-//
-// 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)
-//
-// -----------------------------------------------------------
-
-#include "boost/config.hpp"
-#if !defined (BOOST_NO_STRINGSTREAM)
-# include <sstream>
-#endif
-
-#include "bitset_test.hpp"
-#include <boost/dynamic_bitset/serialization.hpp>
-#include <boost/config/workaround.hpp>
-
-
-// Codewarrior 8.3 for Win fails without this.
-// Thanks Howard Hinnant ;)
-#if defined __MWERKS__ && BOOST_WORKAROUND(__MWERKS__, <= 0x3003) // 8.x
-# pragma parse_func_templ off
-#endif
-
-
-#if defined BOOST_NO_STD_WSTRING || defined BOOST_NO_STD_LOCALE
-# define BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS
-#endif
-
-#include <boost/serialization/vector.hpp>
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/xml_iarchive.hpp>
-#include <sstream>
-
-namespace {
-    template <typename Block>
-        struct SerializableType {
-            boost::dynamic_bitset<Block> x;
-
-          private:
-            friend class boost::serialization::access;
-            template <class Archive> void serialize(Archive &ar, const unsigned int) {
-                ar & BOOST_SERIALIZATION_NVP(x);
-            }
-        };
-
-    template <typename Block, typename IArchive, typename OArchive>
-        void test_serialization( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
-        {
-            SerializableType<Block> a;
-
-            for (int i=0; i<128; ++i)
-                a.x.resize(11*i, i%2);
-
-#if !defined (BOOST_NO_STRINGSTREAM)
-            std::stringstream ss;
-
-            // test serialization
-            {
-                OArchive oa(ss);
-                oa << BOOST_SERIALIZATION_NVP(a);
-            }
-
-            // test de-serialization
-            {
-                IArchive ia(ss);
-                SerializableType<Block> b;
-                ia >> BOOST_SERIALIZATION_NVP(b);
-
-                assert(a.x == b.x);
-            }
-#else
-#           error "TODO implement file-based test path?"
-#endif
-        }
-
-    template <typename Block>
-        void test_binary_archive( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) ) {
-            test_serialization<Block, boost::archive::binary_iarchive, boost::archive::binary_oarchive>();
-        }
-
-    template <typename Block>
-        void test_xml_archive( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) ) {
-            test_serialization<Block, boost::archive::xml_iarchive, boost::archive::xml_oarchive>();
-        }
-}
-
-template <typename Block>
-void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
-{
-    test_binary_archive<Block>();
-    test_xml_archive<Block>();
-}
-
-int main()
-{
-    run_test_cases<unsigned char>();
-    run_test_cases<unsigned short>();
-    run_test_cases<unsigned int>();
-    run_test_cases<unsigned long>();
-# ifdef BOOST_HAS_LONG_LONG
-    run_test_cases< ::boost::ulong_long_type>();
-# endif
-
-    return boost::report_errors();
-}
--- a/test/test_ambiguous_set.cpp
+++ b/test/test_ambiguous_set.cpp
@@ -1,30 +0,0 @@
-//
-// Copyright (C) 2018 James E. King III
-// 
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-// 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)
-//
-
-#include <boost/dynamic_bitset.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-int main(int, char*[])
-{
-    boost::dynamic_bitset<> x(5); // all 0's by default
-    x.set(1, 2);
-    x.set(3, 1, true);
-    x.set(2, 1, false);
-    BOOST_TEST(!x.test(0));
-    BOOST_TEST( x.test(1));
-    BOOST_TEST(!x.test(2));
-    BOOST_TEST( x.test(3));
-    BOOST_TEST(!x.test(4));
-
-    return boost::report_errors();
-}
--- a/test/test_boost_hash.cpp
+++ b/test/test_boost_hash.cpp
@@ -1,47 +0,0 @@
-//
-// Copyright (C) 2019 James E. King III
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-// 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)
-//
-
-#include <boost/config.hpp>
-#include <boost/dynamic_bitset.hpp>
-#include <boost/core/lightweight_test.hpp>
-#include <set>
-
-int main(int, char*[])
-{
-    typedef boost::dynamic_bitset<unsigned long> bitset_type;
-    const std::string long_string =
-        "01001110101110110101011010000000000011110101101111111111";
-    const std::string long_string_prime_begin =
-        "11001110101110110101011010000000000011110101101111111111";
-    const std::string long_string_prime_end =
-        "01001110101110110101011010000000000011110101101111111110";
-
-    bitset_type zeroes(long_string.size(), 0);
-    bitset_type stuff (long_string);
-    bitset_type stupb (long_string_prime_begin);
-    bitset_type stupe (long_string_prime_end);
-    bitset_type ones  (long_string.size(), 1);
-
-    boost::hash<bitset_type> bitset_hasher;
-    std::set<std::size_t> results;
-    results.insert(bitset_hasher(zeroes));
-    results.insert(bitset_hasher(stuff));
-    results.insert(bitset_hasher(stupb));
-    results.insert(bitset_hasher(stupe));
-    results.insert(bitset_hasher(ones));
-
-    // if any hash is identical to another there will be less than 5
-    BOOST_TEST_EQ(results.size(), 5);
-
-    return boost::report_errors();
-}
--- a/test/test_lowest_bit.cpp
+++ b/test/test_lowest_bit.cpp
@@ -1,28 +0,0 @@
-//
-// Copyright (C) 2018 James E. King III
-// 
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-// 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)
-//
-
-#include <boost/cstdint.hpp>
-#include <boost/dynamic_bitset/detail/lowest_bit.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-int main(int, char*[])
-{
-    for (boost::int32_t i = 1; i < 32; ++i) {
-	BOOST_TEST_EQ(i, boost::detail::lowest_bit(1u << i));
-    }
-
-    BOOST_TEST_EQ(2, boost::detail::lowest_bit(123456788));
-    BOOST_TEST_EQ(30, boost::detail::lowest_bit(static_cast<boost::int64_t>(1507208177123328)));
-
-    return boost::report_errors();
-}
--- a/test/test_std_hash.cpp
+++ b/test/test_std_hash.cpp
@@ -1,39 +0,0 @@
-//
-// Copyright (C) 2019 James E. King III
-//
-// Permission to copy, use, modify, sell and distribute this software
-// is granted provided this copyright notice appears in all copies.
-// This software is provided "as is" without express or implied
-// warranty, and with no claim as to its suitability for any purpose.
-//
-// 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)
-//
-
-#include <boost/config.hpp>
-#include <boost/dynamic_bitset.hpp>
-#include <boost/detail/lightweight_test.hpp>
-
-#include <functional>
-#include <unordered_set>
-
-int main(int, char*[])
-{
-    typedef boost::dynamic_bitset<unsigned long> bitset_type;
-    const std::string long_string =
-        "01001110101110110101011010000000000011110101101111111111";
-
-    bitset_type zeroes(long_string.size(), 0);
-    bitset_type stuff (long_string);
-    bitset_type ones  (long_string.size(), 1);
-
-    std::unordered_set<bitset_type> bitsets;
-    bitsets.insert(zeroes);
-    bitsets.insert(stuff);
-    bitsets.insert(ones);
-
-    BOOST_TEST_EQ(bitsets.size(), 3);
-
-    return boost::report_errors();
-}
				`@@ -1 +0,0 @@`
				`The documentation for the dynamic_bitset library is the top-level index.html file.`
				`@@ -0,0 +1 @@`
				`boost_module(dynamic_bitset DEPENDS detail static_assert)`