Merge branch 'feature/min_cmake' of https://github.com/Mike-Devel/bind into feature/pr-15

... to express their dependency on this library and retrieve any
configuration information such as the include directory, binary
to link to (if any), transitive dependencies, necessary compiler
options or the required c++ standards level.

.travis.yml

@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Peter Dimov
+# Copyright 2016, 2017 Peter Dimov
 # 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)
 
@@ -6,8 +6,6 @@ language: cpp
 
 sudo: false
 
-dist: xenial
-
 branches:
   only:
     - master
@@ -24,6 +22,20 @@ matrix:
     - env: BOGUS_JOB=true
 
   include:
+
+      # cmake self-test
+    - os: linux
+      env: TEST_CMAKE=TRUE #Only for easier identification in travis web gui
+      install:
+        - git clone --depth 1 https://github.com/boostorg/config.git ../config
+        - git clone --depth 1 https://github.com/boostorg/core.git ../core
+        - git clone --depth 1 https://github.com/boostorg/assert.git ../assert
+
+      script:
+        - mkdir __build__ && cd __build__
+        - cmake ../test/test_cmake
+        - cmake --build .
+
     - os: linux
       compiler: g++
       env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
@@ -118,22 +130,11 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
-    - os: linux
-      compiler: g++-9
-      env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a
-      addons:
-        apt:
-          packages:
-            - g++-9
-          sources:
-            - ubuntu-toolchain-r-test
-
     - os: linux
       compiler: clang++
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
 
     - os: linux
-      dist: trusty
       compiler: /usr/bin/clang++
       env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
       addons:
@@ -142,7 +143,6 @@ matrix:
             - clang-3.3
 
     - os: linux
-      dist: trusty
       compiler: /usr/bin/clang++
       env: TOOLSET=clang COMPILER=/usr/bin/clang++ CXXSTD=03,11
       addons:
@@ -157,8 +157,10 @@ matrix:
         apt:
           packages:
             - clang-3.5
+            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.5
 
     - os: linux
       compiler: clang++-3.6
@@ -169,6 +171,7 @@ matrix:
             - clang-3.6
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.6
 
     - os: linux
       compiler: clang++-3.7
@@ -179,6 +182,7 @@ matrix:
             - clang-3.7
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.7
 
     - os: linux
       compiler: clang++-3.8
@@ -187,8 +191,10 @@ matrix:
         apt:
           packages:
             - clang-3.8
+            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
 
     - os: linux
       compiler: clang++-3.9
@@ -197,8 +203,10 @@ matrix:
         apt:
           packages:
             - clang-3.9
+            - libstdc++-4.9-dev
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.9
 
     - os: linux
       compiler: clang++-4.0
@@ -209,6 +217,7 @@ matrix:
             - clang-4.0
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-4.0
 
     - os: linux
       compiler: clang++-5.0
@@ -219,6 +228,7 @@ matrix:
             - clang-5.0
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-5.0
 
     - os: linux
       compiler: clang++-6.0
@@ -229,6 +239,7 @@ matrix:
             - clang-6.0
           sources:
             - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-6.0
 
     - os: linux
       compiler: clang++-7
@@ -239,35 +250,11 @@ matrix:
             - clang-7
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-7
+            - llvm-toolchain-trusty-7
 
     - os: linux
-      compiler: clang++-8
-      env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a
-      addons:
-        apt:
-          packages:
-            - clang-8
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-8
-
-    - os: linux
-      compiler: clang++-9
-      env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a
-      addons:
-        apt:
-          packages:
-            - clang-9
-          sources:
-            - ubuntu-toolchain-r-test
-            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
-              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
-
-    - os: linux
-      dist: trusty
       compiler: clang++-libc++
-      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
+      env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z VARIANT=release
       addons:
         apt:
           packages:
@@ -277,38 +264,6 @@ matrix:
       compiler: clang++
       env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
 
-    - os: linux
-      env: CMAKE_TEST=1
-      script:
-        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=bind ..
-        - ctest --output-on-failure -R boost_bind
-
-    - os: linux
-      env: CMAKE_SUBDIR_TEST=1
-      install:
-        - BOOST_BRANCH=develop
-        - if [ "$TRAVIS_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi
-        - git clone -b $BOOST_BRANCH https://github.com/boostorg/assert.git ../assert
-        - git clone -b $BOOST_BRANCH https://github.com/boostorg/config.git ../config
-        - git clone -b $BOOST_BRANCH https://github.com/boostorg/core.git ../core
-      script:
-      - cd test/cmake_subdir_test && mkdir __build__ && cd __build__
-      - cmake ..
-      - cmake --build .
-      - cmake --build . --target check
-
-    - os: linux
-      env: CMAKE_INSTALL_TEST=1
-      script:
-        - mkdir __build__ && cd __build__
-        - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES="assert;bind;config;core" -DCMAKE_INSTALL_PREFIX=~/.local ..
-        - cmake --build . --target install
-        - cd ../libs/bind/test/cmake_install_test && mkdir __build__ && cd __build__
-        - cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
-        - cmake --build .
-        - cmake --build . --target check
-
 install:
   - BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
   - cd ..

CMakeLists.txt

@@ -1,10 +1,12 @@
-# Copyright 2018, 2019 Peter Dimov
+# Copyright 2018 Mike Dev
 # 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.Bind is currently experimental at best
+#       and the interface is likely to change in the future
 
-cmake_minimum_required(VERSION 3.5...3.16)
-
-project(boost_bind VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.5)
+project(BoostBind LANGUAGES CXX)
 
 add_library(boost_bind INTERFACE)
 add_library(Boost::bind ALIAS boost_bind)
@@ -12,20 +14,7 @@ add_library(Boost::bind ALIAS boost_bind)
 target_include_directories(boost_bind INTERFACE include)
 
 target_link_libraries(boost_bind
-  INTERFACE
-    Boost::config
-    Boost::core
+    INTERFACE
+        Boost::config
+        Boost::core
 )
-
-if(BOOST_SUPERPROJECT_VERSION)
-
-  include(BoostInstall)
-  boost_install(TARGETS boost_bind HEADER_DIRECTORY include/)
-
-endif()
-
-if(BUILD_TESTING)
-
-  add_subdirectory(test)
-
-endif()

appveyor.yml

@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Peter Dimov
+# Copyright 2016, 2017 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -14,31 +14,13 @@ branches:
 
 environment:
   matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-12.0,msvc-14.0
-      ADDRESS_MODEL: 32,64
+      TOOLSET: msvc-14.0
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      TOOLSET: msvc-14.1,clang-win
+      TOOLSET: msvc-14.1
       CXXSTD: 14,17
-      ADDRESS_MODEL: 32,64
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\cygwin\bin;
-      TOOLSET: gcc
-      CXXSTD: 03,11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\cygwin64\bin;
-      TOOLSET: gcc
-      CXXSTD: 03,11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\mingw\bin;
-      TOOLSET: gcc
-      CXXSTD: 03,11,14,1z
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;
-      TOOLSET: gcc
-      CXXSTD: 03,11,14,1z
 
 install:
   - set BOOST_BRANCH=develop
@@ -55,7 +37,5 @@ install:
 build: off
 
 test_script:
-  - PATH=%ADDPATH%%PATH%
   - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
-  - if not "%ADDRESS_MODEL%" == "" set ADDRESS_MODEL=address-model=%ADDRESS_MODEL%
-  - b2 -j3 libs/bind/test toolset=%TOOLSET% %CXXSTD% %ADDRESS_MODEL% variant=debug,release
+  - b2 -j 3 libs/bind/test toolset=%TOOLSET% %CXXSTD%

bind_as_compose.cpp

@@ -19,12 +19,10 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <iostream>
 #include <string>
 
-using namespace boost::placeholders;
-
 std::string f(std::string const & x)
 {
     return "f(" + x + ")";

bind_visitor.cpp

@@ -17,12 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/ref.hpp>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
 #include <iostream>
 #include <typeinfo>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
 
 //
 

doc/Jamfile.v2

@@ -4,6 +4,8 @@
 #   (See accompanying file LICENSE_1_0.txt or copy at
 #   http://www.boost.org/LICENSE_1_0.txt)
 
+project doc/bind ;
+
 import boostbook ;
 import quickbook ;
 

doc/bind/implementation.qbk

@@ -11,7 +11,7 @@
 
 [section Files]
 
-* [@../../../../boost/bind/bind.hpp boost/bind/bind.hpp] (main header)
+* [@../../../../boost/bind.hpp boost/bind.hpp] (main header)
 * [@../../../../boost/bind/bind_cc.hpp boost/bind/bind_cc.hpp] (used by `bind.hpp`, do not include directly)
 * [@../../../../boost/bind/bind_mf_cc.hpp boost/bind/bind_mf_cc.hpp] (used by `bind.hpp`, do not include directly)
 * [@../../../../boost/bind/bind_template.hpp boost/bind/bind_template.hpp] (used by `bind.hpp`, do not include directly)
@@ -58,22 +58,22 @@ calling convention known as `__stdcall`. Borland VCL components use
 `__fastcall`. Mac toolbox functions use a `pascal` calling convention.
 
 To use `bind` with `__stdcall` functions, `#define` the macro
-`BOOST_BIND_ENABLE_STDCALL` before including `<boost/bind/bind.hpp>`.
+`BOOST_BIND_ENABLE_STDCALL` before including `<boost/bind.hpp>`.
 
 To use `bind` with `__stdcall` member functions, `#define` the macro
-`BOOST_MEM_FN_ENABLE_STDCALL` before including `<boost/bind/bind.hpp>`.
+`BOOST_MEM_FN_ENABLE_STDCALL` before including `<boost/bind.hpp>`.
 
 To use `bind` with `__fastcall` functions, `#define` the macro
-`BOOST_BIND_ENABLE_FASTCALL` before including `<boost/bind/bind.hpp>`.
+`BOOST_BIND_ENABLE_FASTCALL` before including `<boost/bind.hpp>`.
 
 To use `bind` with `__fastcall` member functions, `#define` the macro
-`BOOST_MEM_FN_ENABLE_FASTCALL` before including `<boost/bind/bind.hpp>`.
+`BOOST_MEM_FN_ENABLE_FASTCALL` before including `<boost/bind.hpp>`.
 
 To use `bind` with `pascal` functions, `#define` the macro
-`BOOST_BIND_ENABLE_PASCAL` before including `<boost/bind/bind.hpp>`.
+`BOOST_BIND_ENABLE_PASCAL` before including `<boost/bind.hpp>`.
 
 To use `bind` with `__cdecl` member functions, `#define` the macro
-`BOOST_MEM_FN_ENABLE_CDECL` before including `<boost/bind/bind.hpp>`.
+`BOOST_MEM_FN_ENABLE_CDECL` before including `<boost/bind.hpp>`.
 
 [*It is best to define these macros in the project options, via `-D` on the
 command line, or as the first line in the translation unit (.cpp file) where

doc/bind/troubleshooting.qbk

@@ -167,8 +167,8 @@ variable:
 [section Modeling STL function object concepts]
 
 The function objects that are produced by `bind` do not model the STL
-[@https://boost.org/sgi/stl/UnaryFunction.html /Unary Function/] or
-[@https://boost.org/sgi/stl/BinaryFunction.html /Binary Function/] concepts,
+[@http://www.sgi.com/tech/stl/UnaryFunction.html /Unary Function/] or
+[@http://www.sgi.com/tech/stl/BinaryFunction.html /Binary Function/] concepts,
 even when the function objects are unary or binary operations, because the
 function object types are missing public typedefs `result_type` and
 `argument_type` or `first_argument_type` and `second_argument_type`. In cases
@@ -181,7 +181,7 @@ and [@http://en.cppreference.com/w/cpp/utility/functional/binary_negate `std::bi
 
 The `make_adaptable` function is defined in [@../../../../boost/bind/make_adaptable.hpp
 `<boost/bind/make_adaptable.hpp>`], which must be included explicitly in
-addition to [@../../../../boost/bind/bind.hpp `<boost/bind/bind.hpp>`]:
+addition to [@../../../../boost/bind.hpp `<boost/bind.hpp>`]:
 
     #include <boost/bind/make_adaptable.hpp>
 
@@ -228,7 +228,7 @@ Workaround: remove the `const` qualifier from the argument.
 
 [section MSVC specific: `using boost::bind;`]
 
-On MSVC (up to version 7.0), when `boost::bind` is brought into scope with an
+On MSVC (up to version 7.0), when `boostbind` is brought into scope with an
 using declaration:
 
     using boost::bind;

doc/html/bind.html

@@ -900,8 +900,8 @@
 </h3></div></div></div>
 <p>
         The function objects that are produced by <code class="computeroutput"><span class="identifier">bind</span></code>
-        do not model the STL <a href="https://boost.org/sgi/stl/UnaryFunction.html" target="_top"><span class="emphasis"><em>Unary
-        Function</em></span></a> or <a href="https://boost.org/sgi/stl/BinaryFunction.html" target="_top"><span class="emphasis"><em>Binary
+        do not model the STL <a href="http://www.sgi.com/tech/stl/UnaryFunction.html" target="_top"><span class="emphasis"><em>Unary
+        Function</em></span></a> or <a href="http://www.sgi.com/tech/stl/BinaryFunction.html" target="_top"><span class="emphasis"><em>Binary
         Function</em></span></a> concepts, even when the function objects are
         unary or binary operations, because the function object types are missing
         public typedefs <code class="computeroutput"><span class="identifier">result_type</span></code>
@@ -916,7 +916,7 @@
 <p>
         The <code class="computeroutput"><span class="identifier">make_adaptable</span></code> function
         is defined in <a href="../../../../boost/bind/make_adaptable.hpp" target="_top"><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">/</span><span class="identifier">make_adaptable</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code></a>,
-        which must be included explicitly in addition to <a href="../../../../boost/bind/bind.hpp" target="_top"><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code></a>:
+        which must be included explicitly in addition to <a href="../../../../boost/bind.hpp" target="_top"><code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code></a>:
       </p>
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">/</span><span class="identifier">make_adaptable</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 
@@ -974,7 +974,7 @@
       specific: <code class="computeroutput"><span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">;</span></code></a>
 </h3></div></div></div>
 <p>
-        On MSVC (up to version 7.0), when <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span></code>
+        On MSVC (up to version 7.0), when <code class="computeroutput"><span class="identifier">boostbind</span></code>
         is brought into scope with an using declaration:
       </p>
 <pre class="programlisting"><span class="keyword">using</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">bind</span><span class="special">;</span>
@@ -1305,8 +1305,8 @@
 </h3></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-            <a href="../../../../boost/bind/bind.hpp" target="_top">boost/bind/bind.hpp</a>
-            (main header)
+            <a href="../../../../boost/bind.hpp" target="_top">boost/bind.hpp</a> (main
+            header)
           </li>
 <li class="listitem">
             <a href="../../../../boost/bind/bind_cc.hpp" target="_top">boost/bind/bind_cc.hpp</a>
@@ -1427,29 +1427,29 @@
 <p>
         To use <code class="computeroutput"><span class="identifier">bind</span></code> with <code class="computeroutput"><span class="identifier">__stdcall</span></code> functions, <code class="computeroutput"><span class="preprocessor">#define</span></code>
         the macro <code class="computeroutput"><span class="identifier">BOOST_BIND_ENABLE_STDCALL</span></code>
-        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
+        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
       </p>
 <p>
         To use <code class="computeroutput"><span class="identifier">bind</span></code> with <code class="computeroutput"><span class="identifier">__stdcall</span></code> member functions, <code class="computeroutput"><span class="preprocessor">#define</span></code> the macro <code class="computeroutput"><span class="identifier">BOOST_MEM_FN_ENABLE_STDCALL</span></code>
-        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
+        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
       </p>
 <p>
         To use <code class="computeroutput"><span class="identifier">bind</span></code> with <code class="computeroutput"><span class="identifier">__fastcall</span></code> functions, <code class="computeroutput"><span class="preprocessor">#define</span></code>
         the macro <code class="computeroutput"><span class="identifier">BOOST_BIND_ENABLE_FASTCALL</span></code>
-        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
+        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
       </p>
 <p>
         To use <code class="computeroutput"><span class="identifier">bind</span></code> with <code class="computeroutput"><span class="identifier">__fastcall</span></code> member functions, <code class="computeroutput"><span class="preprocessor">#define</span></code> the macro <code class="computeroutput"><span class="identifier">BOOST_MEM_FN_ENABLE_FASTCALL</span></code>
-        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
+        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
       </p>
 <p>
         To use <code class="computeroutput"><span class="identifier">bind</span></code> with <code class="computeroutput"><span class="identifier">pascal</span></code> functions, <code class="computeroutput"><span class="preprocessor">#define</span></code>
         the macro <code class="computeroutput"><span class="identifier">BOOST_BIND_ENABLE_PASCAL</span></code>
-        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
+        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
       </p>
 <p>
         To use <code class="computeroutput"><span class="identifier">bind</span></code> with <code class="computeroutput"><span class="identifier">__cdecl</span></code> member functions, <code class="computeroutput"><span class="preprocessor">#define</span></code> the macro <code class="computeroutput"><span class="identifier">BOOST_MEM_FN_ENABLE_CDECL</span></code>
-        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
+        before including <code class="computeroutput"><span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">bind</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span></code>.
       </p>
 <p>
         <span class="bold"><strong>It is best to define these macros in the project options,
@@ -1543,7 +1543,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: December 13, 2019 at 18:24:18 GMT</small></p></td>
+<td align="left"><p><small>Last revised: July 07, 2017 at 11:19:28 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

doc/html/mem_fn.html

@@ -543,7 +543,7 @@
 </div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: December 13, 2019 at 18:24:22 GMT</small></p></td>
+<td align="left"><p><small>Last revised: July 07, 2017 at 11:19:31 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

include/boost/bind.hpp

@@ -7,6 +7,7 @@
 # pragma once
 #endif
 
+//
 //  bind.hpp - binds function objects to arguments
 //
 //  Copyright (c) 2009, 2015 Peter Dimov
@@ -17,31 +18,11 @@
 //
 //  See http://www.boost.org/libs/bind/bind.html for documentation.
 //
-//  For backward compatibility, this header includes
-//  <boost/bind/bind.hpp> and then imports the placeholders _1, _2,
-//  _3, ... into the global namespace. Definitions in the global
-//  namespace are not a good practice and this use is deprecated.
-//  Please switch to including <boost/bind/bind.hpp> directly,
-//  adding the using directive locally where appropriate.
-//  Alternatively, the existing behavior may be preserved by defining
-//  the macro BOOST_BIND_GLOBAL_PLACEHOLDERS.
 
 #include <boost/bind/bind.hpp>
-#include <boost/config/pragma_message.hpp>
 
 #ifndef BOOST_BIND_NO_PLACEHOLDERS
 
-#if !defined(BOOST_BIND_GLOBAL_PLACEHOLDERS)
-
-BOOST_PRAGMA_MESSAGE(
-  "The practice of declaring the Bind placeholders (_1, _2, ...) "
-  "in the global namespace is deprecated. Please use "
-  "<boost/bind/bind.hpp> + using namespace boost::placeholders, "
-  "or define BOOST_BIND_GLOBAL_PLACEHOLDERS to retain the current behavior."
-)
-
-#endif
-
 #if defined(BOOST_CLANG)
 # pragma clang diagnostic push
 # if  __has_warning("-Wheader-hygiene")

include/boost/bind/bind.hpp

@@ -2136,7 +2136,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #undef BOOST_BIND_ST
 #undef BOOST_BIND_NOEXCEPT
 
-#if defined(BOOST_BIND_ENABLE_STDCALL) && !defined(_M_X64)
+#ifdef BOOST_BIND_ENABLE_STDCALL
 
 #define BOOST_BIND_CC __stdcall
 #define BOOST_BIND_ST
@@ -2150,7 +2150,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 
 #endif
 
-#if defined(BOOST_BIND_ENABLE_FASTCALL) && !defined(_M_X64)
+#ifdef BOOST_BIND_ENABLE_FASTCALL
 
 #define BOOST_BIND_CC __fastcall
 #define BOOST_BIND_ST
@@ -2197,7 +2197,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 #undef BOOST_BIND_MF_CC
 #undef BOOST_BIND_MF_NOEXCEPT
 
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_CDECL
 
 #define BOOST_BIND_MF_NAME(X) X##_cdecl
 #define BOOST_BIND_MF_CC __cdecl
@@ -2212,7 +2212,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 
 #endif
 
-#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_STDCALL
 
 #define BOOST_BIND_MF_NAME(X) X##_stdcall
 #define BOOST_BIND_MF_CC __stdcall
@@ -2227,7 +2227,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
 
 #endif
 
-#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
 
 #define BOOST_BIND_MF_NAME(X) X##_fastcall
 #define BOOST_BIND_MF_CC __fastcall

include/boost/bind/mem_fn.hpp

@@ -49,7 +49,7 @@ template<class V> struct mf
 #undef BOOST_MEM_FN_CC
 #undef BOOST_MEM_FN_NAME
 
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_CDECL
 
 #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
 #define BOOST_MEM_FN_CC __cdecl
@@ -61,7 +61,7 @@ template<class V> struct mf
 
 #endif
 
-#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_STDCALL
 
 #define BOOST_MEM_FN_NAME(X) inner_##X##_stdcall
 #define BOOST_MEM_FN_CC __stdcall
@@ -73,7 +73,7 @@ template<class V> struct mf
 
 #endif
 
-#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
 
 #define BOOST_MEM_FN_NAME(X) inner_##X##_fastcall
 #define BOOST_MEM_FN_CC __fastcall
@@ -102,7 +102,7 @@ template<> struct mf<void>
 #undef BOOST_MEM_FN_CC
 #undef BOOST_MEM_FN_NAME
 
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_CDECL
 
 #define BOOST_MEM_FN_NAME(X) inner_##X##_cdecl
 #define BOOST_MEM_FN_CC __cdecl
@@ -155,7 +155,7 @@ template<> struct mf<void>
 #undef BOOST_MEM_FN_NAME2
 #undef BOOST_MEM_FN_CC
 
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_CDECL
 
 #define BOOST_MEM_FN_NAME(X) X##_cdecl
 #define BOOST_MEM_FN_NAME2(X) inner_##X##_cdecl
@@ -217,7 +217,7 @@ namespace _mfi
 #undef BOOST_MEM_FN_CC
 #undef BOOST_MEM_FN_NAME
 
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_CDECL
 
 #define BOOST_MEM_FN_NAME(X) X##_cdecl
 #define BOOST_MEM_FN_CC __cdecl
@@ -229,7 +229,7 @@ namespace _mfi
 
 #endif
 
-#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_STDCALL
 
 #define BOOST_MEM_FN_NAME(X) X##_stdcall
 #define BOOST_MEM_FN_CC __stdcall
@@ -241,7 +241,7 @@ namespace _mfi
 
 #endif
 
-#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
 
 #define BOOST_MEM_FN_NAME(X) X##_fastcall
 #define BOOST_MEM_FN_CC __fastcall
@@ -270,7 +270,7 @@ namespace _mfi
 #undef BOOST_MEM_FN_NAME
 #undef BOOST_MEM_FN_CC
 
-#if defined(BOOST_MEM_FN_ENABLE_CDECL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_CDECL
 
 #define BOOST_MEM_FN_NAME(X) X##_cdecl
 #define BOOST_MEM_FN_CC __cdecl
@@ -282,7 +282,7 @@ namespace _mfi
 
 #endif
 
-#if defined(BOOST_MEM_FN_ENABLE_STDCALL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_STDCALL
 
 #define BOOST_MEM_FN_NAME(X) X##_stdcall
 #define BOOST_MEM_FN_CC __stdcall
@@ -294,7 +294,7 @@ namespace _mfi
 
 #endif
 
-#if defined(BOOST_MEM_FN_ENABLE_FASTCALL) && !defined(_M_X64)
+#ifdef BOOST_MEM_FN_ENABLE_FASTCALL
 
 #define BOOST_MEM_FN_NAME(X) X##_fastcall
 #define BOOST_MEM_FN_CC __fastcall

test/CMakeLists.txt

@@ -1,11 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# 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(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
-
-if(HAVE_BOOST_TEST)
-
-boost_test_jamfile(FILE Jamfile.v2 LINK_LIBRARIES Boost::bind Boost::core Boost::function Boost::smart_ptr)
-
-endif()

test/Jamfile.v2

@@ -72,4 +72,3 @@ run mem_fn_fastcall_test.cpp ;
 run mem_fn_stdcall_test.cpp ;
 run bind_noexcept_test.cpp ;
 run bind_noexcept_mf_test.cpp ;
-run global_placeholders.cpp ;

test/bind_and_or_test.cpp

@@ -17,12 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
 
-//
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 bool f( bool x )
 {

test/bind_cdecl_mf_test.cpp

@@ -27,10 +27,19 @@ int main()
 
 #define BOOST_MEM_FN_ENABLE_CDECL
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/bind_const_test.cpp

@@ -18,11 +18,20 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_cv_test.cpp

@@ -17,10 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/bind_dm2_test.cpp

@@ -17,13 +17,20 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
 #include <string>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
 
-//
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/bind_dm3_test.cpp

@@ -17,14 +17,21 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 #include <utility>
 
-using namespace boost::placeholders;
-
-//
-
 int main()
 {
     typedef std::pair<int, int> pair_type;

test/bind_dm_test.cpp

@@ -17,12 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
 
-//
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/bind_eq2_test.cpp

@@ -17,13 +17,9 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/function_equal.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-using namespace boost::placeholders;
-
-//
+#include <boost/detail/lightweight_test.hpp>
 
 void f( int )
 {

test/bind_eq3_test.cpp

@@ -17,14 +17,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/function_equal.hpp>
 #include <boost/weak_ptr.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-//
-
-using namespace boost::placeholders;
+#include <boost/detail/lightweight_test.hpp>
 
 int f( boost::weak_ptr<void> wp )
 {

test/bind_eq_test.cpp

@@ -17,13 +17,24 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
 
-using namespace boost::placeholders;
+#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+# include <boost/function_equal.hpp>
+#endif
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {
@@ -135,11 +146,23 @@ void fv_9(X, X, X, X, X, X, X, X, X)
 
 template<class F> void test_eq(F f1, F f2)
 {
+#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+
+    using boost::function_equal;
+
+#endif
+
     BOOST_TEST( function_equal( f1, f2 ) );
 }
 
 template<class F> void test_ne(F f1, F f2)
 {
+#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
+
+    using boost::function_equal;
+
+#endif
+
     BOOST_TEST( !function_equal( f1, f2 ) );
 }
 

test/bind_fastcall_mf_test.cpp

@@ -27,10 +27,19 @@ int main()
 
 #define BOOST_MEM_FN_ENABLE_FASTCALL
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/bind_fastcall_test.cpp

@@ -27,10 +27,19 @@ int main()
 
 #define BOOST_BIND_ENABLE_FASTCALL
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_fn2_test.cpp

@@ -17,10 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 long global_result;
 

test/bind_fnobj2_test.cpp

@@ -17,10 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/bind_function2_test.cpp

@@ -10,11 +10,9 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/function.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-using namespace boost::placeholders;
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_function_ap_test.cpp

@@ -26,13 +26,11 @@ int main()
 # endif
 #endif
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/function.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <memory>
 
-using namespace boost::placeholders;
-
 //
 
 void fv1( std::auto_ptr<int> p1 )

test/bind_function_test.cpp

@@ -17,11 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/function.hpp>
-#include <boost/core/lightweight_test.hpp>
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
 
-//
+#include <iostream>
+#include <boost/function.hpp>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/bind.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 int f( int x )
 {

test/bind_fwd2_test.cpp

@@ -10,10 +10,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-using namespace boost::placeholders;
+#include <boost/bind.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_fwd_test.cpp

@@ -10,10 +10,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-using namespace boost::placeholders;
+#include <boost/bind.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_lookup_problem_test.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 
 template<class T> void value();
 

test/bind_mf2_test.cpp

@@ -17,10 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/bind_nested_rv_test.cpp

@@ -10,12 +10,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/make_shared.hpp>
 #include <boost/function.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-using namespace boost::placeholders;
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_noexcept_mf_test.cpp

@@ -8,7 +8,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/ref.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>

test/bind_noexcept_test.cpp

@@ -8,12 +8,10 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/config.hpp>
 
-using namespace boost::placeholders;
-
 #if defined(BOOST_NO_CXX11_NOEXCEPT)
 
 int main()

test/bind_not_test.cpp

@@ -17,12 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
 
-//
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 template<class F, class A1, class R> void test( F f, A1 a1, R r )
 {

test/bind_placeholder_test.cpp

@@ -18,8 +18,19 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_ref_test.cpp

@@ -8,13 +8,9 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-using namespace boost::placeholders;
-
-//
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/bind_rel_test.cpp

@@ -17,12 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
 
-//
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 int f( int x )
 {

test/bind_rv_sp_test.cpp

@@ -17,11 +17,20 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
+#include <boost/shared_ptr.hpp>
 
 struct X
 {

test/bind_rvalue_test.cpp

@@ -18,10 +18,19 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_stateful_test.cpp

@@ -17,10 +17,19 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 class X
 {

test/bind_stdcall_mf_test.cpp

@@ -27,10 +27,19 @@ int main()
 
 #define BOOST_MEM_FN_ENABLE_STDCALL
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 struct X
 {

test/bind_stdcall_test.cpp

@@ -29,10 +29,19 @@ int main()
 
 #define BOOST_BIND_ENABLE_STDCALL
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_test.cpp

@@ -18,11 +18,20 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_type_test.cpp

@@ -10,10 +10,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-using namespace boost::placeholders;
+#include <boost/bind.hpp>
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_unary_addr.cpp

@@ -17,9 +17,17 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 
-//
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
 
 class X
 {

test/bind_unique_ptr_test.cpp

@@ -18,12 +18,10 @@ int main()
 //  http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
+#include <boost/detail/lightweight_test.hpp>
 #include <memory>
 
-using namespace boost::placeholders;
-
 //
 
 void fv1( std::unique_ptr<int> p1 )

test/bind_visit_test.cpp

@@ -15,14 +15,21 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/visit_each.hpp>
-#include <boost/core/lightweight_test.hpp>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+# pragma warning(push, 3)
+#endif
+
+#include <iostream>
 #include <typeinfo>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+# pragma warning(pop)
+#endif
 
-//
+#include <boost/detail/lightweight_test.hpp>
 
 struct visitor
 {

test/bind_void_dm_test.cpp

@@ -18,11 +18,20 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_void_mf_test.cpp

@@ -18,9 +18,20 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/bind_void_test.cpp

@@ -18,11 +18,20 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/ref.hpp>
-#include <boost/core/lightweight_test.hpp>
 
-using namespace boost::placeholders;
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(push, 3)
+#endif
+
+#include <iostream>
+
+#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
+#pragma warning(pop)
+#endif
+
+#include <boost/detail/lightweight_test.hpp>
 
 //
 

test/cmake_install_test/CMakeLists.txt

@@ -1,18 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# 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
-
-cmake_minimum_required(VERSION 3.5...3.16)
-
-project(cmake_install_test LANGUAGES CXX)
-
-find_package(boost_bind REQUIRED)
-find_package(boost_core REQUIRED)
-
-add_executable(quick ../quick.cpp)
-target_link_libraries(quick Boost::bind Boost::core)
-
-enable_testing()
-add_test(quick quick)
-
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/cmake_subdir_test/CMakeLists.txt

@@ -1,20 +0,0 @@
-# Copyright 2018, 2019 Peter Dimov
-# 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
-
-cmake_minimum_required(VERSION 3.5...3.16)
-
-project(cmake_subdir_test LANGUAGES CXX)
-
-add_subdirectory(../.. boostorg/bind)
-add_subdirectory(../../../assert boostorg/assert)
-add_subdirectory(../../../config boostorg/config)
-add_subdirectory(../../../core boostorg/core)
-
-add_executable(quick ../quick.cpp)
-target_link_libraries(quick Boost::bind Boost::core)
-
-enable_testing()
-add_test(quick quick)
-
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

test/global_placeholders.cpp

@@ -1,22 +0,0 @@
-// Copyright 2017, 2020 Peter Dimov
-// Distributed under the Boost Software License, Version 1.0.
-// https://www.boost.org/LICENSE_1_0.txt
-
-#include <boost/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
-
-//
-
-int f( int a, int b, int c )
-{
-    return a + 10 * b + 100 * c;
-}
-
-int main()
-{
-    int const i = 1;
-
-    BOOST_TEST_EQ( boost::bind( f, _1, 2, _2 )( i, 3 ), 321 );
-
-    return boost::report_errors();
-}

test/placeholder_std_bind_test.cpp

@@ -18,14 +18,10 @@ int main()
 
 #else
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <functional>
 
-using namespace boost::placeholders;
-
-//
-
 namespace std
 {
 

test/protect_test.cpp

@@ -8,12 +8,9 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/bind/protect.hpp>
-#include <boost/bind/bind.hpp>
-#include <boost/core/lightweight_test.hpp>
+#include <boost/bind.hpp>
 
-using namespace boost::placeholders;
-
-//
+#include <boost/detail/lightweight_test.hpp>
 
 int f(int x)
 {

test/quick.cpp

@@ -1,5 +1,5 @@
 //
-// quick.cpp - a quick test for boost/bind/bind.hpp
+// quick.cpp - a quick test for boost/bind.hpp
 //
 // Copyright 2017 Peter Dimov
 //
@@ -9,13 +9,9 @@
 // http://www.boost.org/LICENSE_1_0.txt
 //
 
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 #include <boost/core/lightweight_test.hpp>
 
-using namespace boost::placeholders;
-
-//
-
 int f( int a, int b, int c )
 {
     return a + 10 * b + 100 * c;

test/test_cmake/CMakeLists.txt

@@ -0,0 +1,20 @@
+# Copyright 2018 Mike Dev
+# 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: This does NOT run the unit tests for Boost.Bind.
+#       It only tests, if the CMakeLists.txt file in it's root works as expected
+
+cmake_minimum_required( VERSION 3.5 )
+
+project( BoostBindCMakeSelfTest )
+
+add_subdirectory( ../../../config ${CMAKE_CURRENT_BINARY_DIR}/libs/config )
+add_subdirectory( ../../../core ${CMAKE_CURRENT_BINARY_DIR}/libs/core )
+add_subdirectory( ../../../assert ${CMAKE_CURRENT_BINARY_DIR}/libs/assert )
+
+add_subdirectory( ../.. ${CMAKE_CURRENT_BINARY_DIR}/libs/boost_bind )
+
+add_executable( boost_bind_cmake_self_test main.cpp )
+target_link_libraries( boost_bind_cmake_self_test Boost::bind )
+

test/test_cmake/main.cpp

@@ -0,0 +1,5 @@
+#include <boost/bind.hpp>
+
+int main() {
+
+}