Compare commits

..

2 Commits

Author SHA1 Message Date
nobody
31b04d14bf This commit was manufactured by cvs2svn to create tag
'Version_1_32_0'.

[SVN r26264]
2004-11-19 19:19:18 +00:00
nobody
f3250a605b This commit was manufactured by cvs2svn to create branch 'RC_1_32_0'.
[SVN r25797]
2004-10-20 08:26:43 +00:00
61 changed files with 1200 additions and 4708 deletions

View File

@@ -1,382 +0,0 @@
# Copyright 2022 Peter Dimov
# Distributed under the Boost Software License, Version 1.0.
# https://www.boost.org/LICENSE_1_0.txt
local library = "function";
local triggers =
{
branch: [ "master", "develop", "feature/*" ]
};
local ubsan = { UBSAN: '1', UBSAN_OPTIONS: 'print_stacktrace=1' };
local asan = { ASAN: '1' };
local linux_pipeline(name, image, environment, packages = "", sources = [], arch = "amd64") =
{
name: name,
kind: "pipeline",
type: "docker",
trigger: triggers,
platform:
{
os: "linux",
arch: arch
},
steps:
[
{
name: "everything",
image: image,
environment: environment,
commands:
[
'set -e',
'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -',
] +
(if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) +
(if packages != "" then [ 'apt-get update', 'apt-get -y install ' + packages ] else []) +
[
'export LIBRARY=' + library,
'./.drone/drone.sh',
]
}
]
};
local macos_pipeline(name, environment, xcode_version = "12.2", osx_version = "catalina", arch = "amd64") =
{
name: name,
kind: "pipeline",
type: "exec",
trigger: triggers,
platform: {
"os": "darwin",
"arch": arch
},
node: {
"os": osx_version
},
steps: [
{
name: "everything",
environment: environment + { "DEVELOPER_DIR": "/Applications/Xcode-" + xcode_version + ".app/Contents/Developer" },
commands:
[
'export LIBRARY=' + library,
'./.drone/drone.sh',
]
}
]
};
local windows_pipeline(name, image, environment, arch = "amd64") =
{
name: name,
kind: "pipeline",
type: "docker",
trigger: triggers,
platform:
{
os: "windows",
arch: arch
},
"steps":
[
{
name: "everything",
image: image,
environment: environment,
commands:
[
'cmd /C .drone\\\\drone.bat ' + library,
]
}
]
};
[
linux_pipeline(
"Linux 14.04 GCC 4.4",
"cppalliance/droneubuntu1404:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-4.4', CXXSTD: '98,0x' },
"g++-4.4",
[ "ppa:ubuntu-toolchain-r/test" ],
),
linux_pipeline(
"Linux 14.04 GCC 4.6 32/64",
"cppalliance/droneubuntu1404:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-4.6', CXXSTD: '98,0x', ADDRMD: '32,64' },
"g++-4.6-multilib",
[ "ppa:ubuntu-toolchain-r/test" ],
),
linux_pipeline(
"Linux 14.04 GCC 4.7 32/64",
"cppalliance/droneubuntu1404:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-4.7', CXXSTD: '98,0x', ADDRMD: '32,64' },
"g++-4.7-multilib",
[ "ppa:ubuntu-toolchain-r/test" ],
),
linux_pipeline(
"Linux 14.04 GCC 4.8* 32/64",
"cppalliance/droneubuntu1404:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11', ADDRMD: '32,64' },
),
linux_pipeline(
"Linux 14.04 GCC 4.9 32/64",
"cppalliance/droneubuntu1404:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-4.9', CXXSTD: '03,11', ADDRMD: '32,64' },
"g++-4.9-multilib",
[ "ppa:ubuntu-toolchain-r/test" ],
),
linux_pipeline(
"Linux 16.04 GCC 5* 32/64",
"cppalliance/droneubuntu1604:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11,14', ADDRMD: '32,64' },
),
linux_pipeline(
"Linux 18.04 GCC 6 32/64",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-6', CXXSTD: '03,11,14', ADDRMD: '32,64' },
"g++-6-multilib",
),
linux_pipeline(
"Linux 18.04 GCC 7* 32/64",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11,14,17', ADDRMD: '32,64' },
),
linux_pipeline(
"Linux 18.04 GCC 8 32/64",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-8', CXXSTD: '03,11,14,17', ADDRMD: '32,64' },
"g++-8-multilib",
),
linux_pipeline(
"Linux 20.04 GCC 9* 32/64",
"cppalliance/droneubuntu2004:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11,14,17,2a', ADDRMD: '32,64' },
),
linux_pipeline(
"Linux 20.04 GCC 9* ARM64",
"cppalliance/droneubuntu2004:multiarch",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11,14,17,2a' },
arch="arm64",
),
linux_pipeline(
"Linux 20.04 GCC 9* S390x",
"cppalliance/droneubuntu2004:multiarch",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11,14,17,2a' },
arch="s390x",
),
linux_pipeline(
"Linux 20.04 GCC 10 32/64",
"cppalliance/droneubuntu2004:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-10', CXXSTD: '03,11,14,17,20', ADDRMD: '32,64' },
"g++-10-multilib",
),
linux_pipeline(
"Linux 22.04 GCC 11* 32/64",
"cppalliance/droneubuntu2204:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '03,11,14,17,2a', ADDRMD: '32,64' },
),
linux_pipeline(
"Linux 22.04 GCC 12 32 ASAN",
"cppalliance/droneubuntu2204:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '03,11,14,17,20,2b', ADDRMD: '32' } + asan,
"g++-12-multilib",
),
linux_pipeline(
"Linux 22.04 GCC 12 64 ASAN",
"cppalliance/droneubuntu2204:1",
{ TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '03,11,14,17,20,2b', ADDRMD: '64' } + asan,
"g++-12-multilib",
),
linux_pipeline(
"Linux 16.04 Clang 3.5",
"cppalliance/droneubuntu1604:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-3.5', CXXSTD: '03,11' },
"clang-3.5",
),
linux_pipeline(
"Linux 16.04 Clang 3.6",
"cppalliance/droneubuntu1604:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-3.6', CXXSTD: '03,11,14' },
"clang-3.6",
),
linux_pipeline(
"Linux 16.04 Clang 3.7",
"cppalliance/droneubuntu1604:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-3.7', CXXSTD: '03,11,14' },
"clang-3.7",
),
linux_pipeline(
"Linux 16.04 Clang 3.8",
"cppalliance/droneubuntu1604:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-3.8', CXXSTD: '03,11,14' },
"clang-3.8",
),
linux_pipeline(
"Linux 18.04 Clang 3.9",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-3.9', CXXSTD: '03,11,14' },
"clang-3.9",
),
linux_pipeline(
"Linux 18.04 Clang 4.0",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-4.0', CXXSTD: '03,11,14' },
"clang-4.0",
),
linux_pipeline(
"Linux 18.04 Clang 5.0",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-5.0', CXXSTD: '03,11,14,1z' },
"clang-5.0",
),
linux_pipeline(
"Linux 18.04 Clang 6.0",
"cppalliance/droneubuntu1804:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-6.0', CXXSTD: '03,11,14,17' },
"clang-6.0",
),
linux_pipeline(
"Linux 20.04 Clang 7",
"cppalliance/droneubuntu2004:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-7', CXXSTD: '03,11,14,17' },
"clang-7",
),
linux_pipeline(
"Linux 20.04 Clang 8",
"cppalliance/droneubuntu2004:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-8', CXXSTD: '03,11,14,17' },
"clang-8",
),
linux_pipeline(
"Linux 20.04 Clang 9",
"cppalliance/droneubuntu2004:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-9', CXXSTD: '03,11,14,17,2a' },
"clang-9",
),
linux_pipeline(
"Linux 20.04 Clang 10",
"cppalliance/droneubuntu2004:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-10', CXXSTD: '03,11,14,17,2a' },
"clang-10",
),
linux_pipeline(
"Linux 20.04 Clang 11",
"cppalliance/droneubuntu2004:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-11', CXXSTD: '03,11,14,17,2a' },
"clang-11",
),
linux_pipeline(
"Linux 20.04 Clang 12",
"cppalliance/droneubuntu2004:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-12', CXXSTD: '03,11,14,17,2a' },
"clang-12",
),
linux_pipeline(
"Linux 22.04 Clang 13",
"cppalliance/droneubuntu2204:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-13', CXXSTD: '03,11,14,17,20' },
"clang-13",
),
linux_pipeline(
"Linux 22.04 Clang 14 UBSAN",
"cppalliance/droneubuntu2204:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-14', CXXSTD: '03,11,14,17,20,2b' } + ubsan,
"clang-14",
),
linux_pipeline(
"Linux 22.04 Clang 14 ASAN",
"cppalliance/droneubuntu2204:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-14', CXXSTD: '03,11,14,17,20,2b' } + asan,
"clang-14",
),
linux_pipeline(
"Linux 22.04 Clang 15",
"cppalliance/droneubuntu2204:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-15', CXXSTD: '03,11,14,17,20,2b' },
"clang-15",
["deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"],
),
macos_pipeline(
"MacOS 10.15 Xcode 12.2 UBSAN",
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,17,2a' } + ubsan,
),
macos_pipeline(
"MacOS 10.15 Xcode 12.2 ASAN",
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,17,2a' } + asan,
),
macos_pipeline(
"MacOS 12.4 Xcode 13.4.1 UBSAN",
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,17,20,2b' } + ubsan,
xcode_version = "13.4.1", osx_version = "monterey", arch = "arm64",
),
macos_pipeline(
"MacOS 12.4 Xcode 13.4.1 ASAN",
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,17,20,2b' } + asan,
xcode_version = "13.4.1", osx_version = "monterey", arch = "arm64",
),
windows_pipeline(
"Windows VS2015 msvc-14.0",
"cppalliance/dronevs2015",
{ TOOLSET: 'msvc-14.0', CXXSTD: '14,latest' },
),
windows_pipeline(
"Windows VS2017 msvc-14.1",
"cppalliance/dronevs2017",
{ TOOLSET: 'msvc-14.1', CXXSTD: '14,17,latest' },
),
windows_pipeline(
"Windows VS2019 msvc-14.2",
"cppalliance/dronevs2019",
{ TOOLSET: 'msvc-14.2', CXXSTD: '14,17,20,latest' },
),
windows_pipeline(
"Windows VS2022 msvc-14.3",
"cppalliance/dronevs2022:1",
{ TOOLSET: 'msvc-14.3', CXXSTD: '14,17,20,latest' },
),
]

View File

@@ -1,23 +0,0 @@
@REM Copyright 2022 Peter Dimov
@REM Distributed under the Boost Software License, Version 1.0.
@REM https://www.boost.org/LICENSE_1_0.txt
@ECHO ON
set LIBRARY=%1
set DRONE_BUILD_DIR=%CD%
set BOOST_BRANCH=develop
if "%DRONE_BRANCH%" == "master" set BOOST_BRANCH=master
cd ..
git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
cd boost-root
git submodule update --init tools/boostdep
xcopy /s /e /q %DRONE_BUILD_DIR% libs\%LIBRARY%\
python tools/boostdep/depinst/depinst.py -I example %LIBRARY%
cmd /c bootstrap
b2 -d0 headers
if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
b2 -j3 libs/%LIBRARY%/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release embed-manifest-via=linker

View File

@@ -1,25 +0,0 @@
#!/bin/bash
# Copyright 2022 Peter Dimov
# Distributed under the Boost Software License, Version 1.0.
# https://www.boost.org/LICENSE_1_0.txt
set -ex
export PATH=~/.local/bin:/usr/local/bin:$PATH
DRONE_BUILD_DIR=$(pwd)
BOOST_BRANCH=develop
if [ "$DRONE_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi
cd ..
git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
cd boost-root
git submodule update --init tools/boostdep
cp -r $DRONE_BUILD_DIR/* libs/$LIBRARY
python tools/boostdep/depinst/depinst.py -I example $LIBRARY
./bootstrap.sh
./b2 -d0 headers
echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
./b2 -j3 libs/$LIBRARY/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${ADDRMD:+address-model=$ADDRMD} ${UBSAN:+undefined-sanitizer=norecover debug-symbols=on} ${ASAN:+address-sanitizer=norecover debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}

View File

@@ -1,392 +0,0 @@
name: CI
on:
pull_request:
push:
branches:
- master
- develop
- feature/**
env:
UBSAN_OPTIONS: print_stacktrace=1
jobs:
posix:
strategy:
fail-fast: false
matrix:
include:
- toolset: gcc-4.8
cxxstd: "03,11"
os: ubuntu-18.04
install: g++-4.8-multilib
address-model: 32,64
- toolset: gcc-5
cxxstd: "03,11,14,1z"
os: ubuntu-18.04
install: g++-5-multilib
address-model: 32,64
- toolset: gcc-6
cxxstd: "03,11,14,1z"
os: ubuntu-18.04
install: g++-6-multilib
address-model: 32,64
- toolset: gcc-7
cxxstd: "03,11,14,17"
os: ubuntu-18.04
install: g++-7-multilib
address-model: 32,64
- toolset: gcc-8
cxxstd: "03,11,14,17,2a"
os: ubuntu-18.04
install: g++-8-multilib
address-model: 32,64
- toolset: gcc-9
cxxstd: "03,11,14,17,2a"
os: ubuntu-20.04
install: g++-9-multilib
address-model: 32,64
- toolset: gcc-10
cxxstd: "03,11,14,17,2a"
os: ubuntu-20.04
install: g++-10-multilib
address-model: 32,64
- toolset: gcc-11
cxxstd: "03,11,14,17,20,2b"
os: ubuntu-22.04
install: g++-11-multilib
address-model: 32,64
- toolset: gcc-12
cxxstd: "03,11,14,17,20,2b"
os: ubuntu-22.04
install: g++-12-multilib
address-model: 32,64
- toolset: clang
compiler: clang++-3.9
cxxstd: "03,11,14"
os: ubuntu-18.04
install: clang-3.9
- toolset: clang
compiler: clang++-4.0
cxxstd: "03,11,14"
os: ubuntu-18.04
install: clang-4.0
- toolset: clang
compiler: clang++-5.0
cxxstd: "03,11,14,1z"
os: ubuntu-18.04
install: clang-5.0
- toolset: clang
compiler: clang++-6.0
cxxstd: "03,11,14,17"
os: ubuntu-18.04
install: clang-6.0
- toolset: clang
compiler: clang++-7
cxxstd: "03,11,14,17"
os: ubuntu-18.04
install: clang-7
- toolset: clang
compiler: clang++-8
cxxstd: "03,11,14,17"
os: ubuntu-20.04
install: clang-8
- toolset: clang
compiler: clang++-9
cxxstd: "03,11,14,17"
os: ubuntu-20.04
install: clang-9
- toolset: clang
compiler: clang++-10
cxxstd: "03,11,14,17,2a"
os: ubuntu-20.04
- toolset: clang
compiler: clang++-11
cxxstd: "03,11,14,17,2a"
os: ubuntu-20.04
- toolset: clang
compiler: clang++-12
cxxstd: "03,11,14,17,20"
os: ubuntu-20.04
- toolset: clang
compiler: clang++-13
cxxstd: "03,11,14,17,20"
os: ubuntu-22.04
install: clang-13
- toolset: clang
compiler: clang++-14
cxxstd: "03,11,14,17,20,2b"
os: ubuntu-22.04
install: clang-14
- toolset: clang
compiler: clang++-15
cxxstd: "03,11,14,17,20,2b"
os: ubuntu-22.04
install: clang-15
- toolset: clang
cxxstd: "03,11,14,17,2a"
os: macos-11
- toolset: clang
cxxstd: "03,11,14,17,20,2b"
os: macos-12
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- name: Install packages
if: matrix.install
run: sudo apt install ${{matrix.install}}
- name: Setup Boost
run: |
echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
LIBRARY=${GITHUB_REPOSITORY#*/}
echo LIBRARY: $LIBRARY
echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
echo GITHUB_BASE_REF: $GITHUB_BASE_REF
echo GITHUB_REF: $GITHUB_REF
REF=${GITHUB_BASE_REF:-$GITHUB_REF}
REF=${REF#refs/heads/}
echo REF: $REF
BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
echo BOOST_BRANCH: $BOOST_BRANCH
cd ..
git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
cd boost-root
cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
./bootstrap.sh
./b2 -d0 headers
- name: Create user-config.jam
if: matrix.compiler
run: |
echo "using ${{matrix.toolset}} : : ${{matrix.compiler}} ;" > ~/user-config.jam
- name: Run tests
run: |
cd ../boost-root
export ADDRMD=${{matrix.address-model}}
./b2 -j3 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} ${ADDRMD:+address-model=$ADDRMD} variant=debug,release
windows:
strategy:
fail-fast: false
matrix:
include:
- toolset: msvc-14.0
cxxstd: 14,latest
addrmd: 32,64
os: windows-2019
- toolset: msvc-14.2
cxxstd: "14,17,20,latest"
addrmd: 32,64
os: windows-2019
- toolset: msvc-14.3
cxxstd: "14,17,20,latest"
addrmd: 32,64
os: windows-2022
- toolset: clang-win
cxxstd: "14,17,latest"
addrmd: 32,64
os: windows-2022
- toolset: gcc
cxxstd: "03,11,14,17,2a"
addrmd: 64
os: windows-2019
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- name: Setup Boost
shell: cmd
run: |
echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
echo LIBRARY: %LIBRARY%
echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
echo GITHUB_REF: %GITHUB_REF%
if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
set BOOST_BRANCH=develop
for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
echo BOOST_BRANCH: %BOOST_BRANCH%
cd ..
git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
cd boost-root
xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
cmd /c bootstrap
b2 -d0 headers
- name: Run tests
shell: cmd
run: |
cd ../boost-root
b2 -j3 libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release embed-manifest-via=linker
posix-cmake-subdir:
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- name: Install packages
if: matrix.install
run: sudo apt install ${{matrix.install}}
- name: Setup Boost
run: |
echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
LIBRARY=${GITHUB_REPOSITORY#*/}
echo LIBRARY: $LIBRARY
echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
echo GITHUB_BASE_REF: $GITHUB_BASE_REF
echo GITHUB_REF: $GITHUB_REF
REF=${GITHUB_BASE_REF:-$GITHUB_REF}
REF=${REF#refs/heads/}
echo REF: $REF
BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
echo BOOST_BRANCH: $BOOST_BRANCH
cd ..
git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
cd boost-root
cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
- name: Use library with add_subdirectory
run: |
cd ../boost-root/libs/$LIBRARY/test/cmake_subdir_test
mkdir __build__ && cd __build__
cmake ..
cmake --build .
ctest --output-on-failure --no-tests=error
posix-cmake-install:
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- name: Install packages
if: matrix.install
run: sudo apt install ${{matrix.install}}
- name: Setup Boost
run: |
echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
LIBRARY=${GITHUB_REPOSITORY#*/}
echo LIBRARY: $LIBRARY
echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
echo GITHUB_BASE_REF: $GITHUB_BASE_REF
echo GITHUB_REF: $GITHUB_REF
REF=${GITHUB_BASE_REF:-$GITHUB_REF}
REF=${REF#refs/heads/}
echo REF: $REF
BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
echo BOOST_BRANCH: $BOOST_BRANCH
cd ..
git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
cd boost-root
cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
- name: Configure
run: |
cd ../boost-root
mkdir __build__ && cd __build__
cmake -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DCMAKE_INSTALL_PREFIX=~/.local ..
- name: Install
run: |
cd ../boost-root/__build__
cmake --build . --target install
- name: Use the installed library
run: |
cd ../boost-root/libs/$LIBRARY/test/cmake_install_test && mkdir __build__ && cd __build__
cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
cmake --build .
ctest --output-on-failure --no-tests=error
posix-cmake-test:
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-20.04
- os: ubuntu-22.04
- os: macos-11
- os: macos-12
runs-on: ${{matrix.os}}
steps:
- uses: actions/checkout@v3
- name: Install packages
if: matrix.install
run: sudo apt install ${{matrix.install}}
- name: Setup Boost
run: |
echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
LIBRARY=${GITHUB_REPOSITORY#*/}
echo LIBRARY: $LIBRARY
echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
echo GITHUB_BASE_REF: $GITHUB_BASE_REF
echo GITHUB_REF: $GITHUB_REF
REF=${GITHUB_BASE_REF:-$GITHUB_REF}
REF=${REF#refs/heads/}
echo REF: $REF
BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
echo BOOST_BRANCH: $BOOST_BRANCH
cd ..
git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
cd boost-root
cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
git submodule update --init tools/boostdep
python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
- name: Configure
run: |
cd ../boost-root
mkdir __build__ && cd __build__
cmake -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DBUILD_TESTING=ON ..
- name: Build tests
run: |
cd ../boost-root/__build__
cmake --build . --target tests
- name: Run tests
run: |
cd ../boost-root/__build__
ctest --output-on-failure --no-tests=error

View File

@@ -1,362 +0,0 @@
# Copyright 2016-2019 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)
language: cpp
dist: xenial
branches:
only:
- master
- develop
- /feature\/.*/
env:
matrix:
- BOGUS_JOB=true
matrix:
exclude:
- env: BOGUS_JOB=true
include:
- os: linux
compiler: g++-4.4
env: TOOLSET=gcc CXXSTD=98,0x
addons:
apt:
packages:
- g++-4.4
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-4.6
env: TOOLSET=gcc CXXSTD=03,0x
addons:
apt:
packages:
- g++-4.6
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-4.7
env: TOOLSET=gcc CXXSTD=03,11
addons:
apt:
packages:
- g++-4.7
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-4.8
env: TOOLSET=gcc CXXSTD=03,11
addons:
apt:
packages:
- g++-4.8
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-4.9
env: TOOLSET=gcc CXXSTD=03,11
addons:
apt:
packages:
- g++-4.9
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-5
env: TOOLSET=gcc CXXSTD=03,11,14,1z
addons:
apt:
packages:
- g++-5
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-6
env: TOOLSET=gcc CXXSTD=03,11,14,1z
addons:
apt:
packages:
- g++-6
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-7
env: TOOLSET=gcc CXXSTD=03,11,14,17
addons:
apt:
packages:
- g++-7
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-8
env: TOOLSET=gcc CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- g++-8
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-9
env: TOOLSET=gcc CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- g++-9
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: bionic
compiler: g++-10
env: UBSAN=1 TOOLSET=gcc CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
addons:
apt:
packages:
- g++-10
sources:
- ubuntu-toolchain-r-test
- os: linux
dist: trusty
compiler: /usr/bin/clang++
env: TOOLSET=clang CXXSTD=03,11
addons:
apt:
packages:
- clang-3.3
- os: linux
dist: trusty
compiler: /usr/bin/clang++
env: TOOLSET=clang CXXSTD=03,11
addons:
apt:
packages:
- clang-3.4
- os: linux
compiler: clang++-3.5
env: TOOLSET=clang CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-3.5
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: clang++-3.6
env: TOOLSET=clang CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-3.6
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: clang++-3.7
env: TOOLSET=clang CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-3.7
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: clang++-3.8
env: TOOLSET=clang CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-3.8
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: clang++-3.9
env: TOOLSET=clang CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-3.9
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: clang++-4.0
env: TOOLSET=clang CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-4.0
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: clang++-5.0
env: TOOLSET=clang CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-5.0
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: clang++-6.0
env: TOOLSET=clang CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- clang-6.0
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: clang++-7
env: TOOLSET=clang CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- clang-7
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-7
- os: linux
compiler: clang++-8
env: TOOLSET=clang CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- clang-8
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-8
- os: linux
dist: bionic
compiler: clang++-9
env: TOOLSET=clang CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- clang-9
sources:
- ubuntu-toolchain-r-test
- sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- os: linux
dist: bionic
compiler: clang++-10
env: TOOLSET=clang CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- clang-10
sources:
- ubuntu-toolchain-r-test
- sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- os: linux
dist: bionic
compiler: clang++-11
env: TOOLSET=clang CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- clang-11
sources:
- ubuntu-toolchain-r-test
- sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- os: linux
dist: bionic
compiler: clang++-12
env: UBSAN=1 TOOLSET=clang CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1
addons:
apt:
packages:
- clang-12
sources:
- ubuntu-toolchain-r-test
- sourceline: 'deb https://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main'
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- os: linux
dist: trusty
compiler: clang++-libc++
env: UBSAN=1 TOOLSET=clang CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
addons:
apt:
packages:
- libc++-dev
- os: linux
dist: bionic
compiler: clang++-libc++
env: UBSAN=1 TOOLSET=clang CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1
addons:
apt:
packages:
- libc++-dev
- os: osx
compiler: clang++
env: UBSAN=1 TOOLSET=clang CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
- os: linux
env: CMAKE_TEST=1
script:
- mkdir __build__ && cd __build__
- cmake -DBOOST_ENABLE_CMAKE=1 -DBUILD_TESTING=ON -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=function ..
- ctest --output-on-failure -R boost_function
- os: linux
env: CMAKE_SUBDIR_TEST=1
script:
- cd libs/function/test/cmake_subdir_test && mkdir __build__ && cd __build__
- cmake ..
- cmake --build .
- cmake --build . --target check
install:
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
- cd ..
- git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost-root
- cd boost-root
- git submodule update --init tools/boostdep
- cp -r $TRAVIS_BUILD_DIR/* libs/function
- python tools/boostdep/depinst/depinst.py function
- ./bootstrap.sh
- ./b2 headers
script:
- |-
echo "using $TOOLSET : : $TRAVIS_COMPILER ;" > ~/user-config.jam
- ./b2 -j3 libs/function/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
notifications:
email:
on_success: always

View File

@@ -1,32 +0,0 @@
# Generated by `boostdep --cmake function`
# Copyright 2020, 2021 Peter Dimov
# Distributed under the Boost Software License, Version 1.0.
# https://www.boost.org/LICENSE_1_0.txt
cmake_minimum_required(VERSION 3.5...3.20)
project(boost_function VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
add_library(boost_function INTERFACE)
add_library(Boost::function ALIAS boost_function)
target_include_directories(boost_function INTERFACE include)
target_link_libraries(boost_function
INTERFACE
Boost::assert
Boost::bind
Boost::config
Boost::core
Boost::preprocessor
Boost::throw_exception
Boost::type_index
Boost::type_traits
Boost::typeof
)
if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
add_subdirectory(test)
endif()

View File

@@ -1,18 +0,0 @@
# Boost.Function, a polymorphic function wrapper
[Boost.Function](http://boost.org/libs/function), part of the
[Boost C++ Libraries](http://boost.org), is the original implementation of the
polymorphic function wrapper `boost::function`, which was eventually accepted
into the C++11 standard as [`std::function`](https://en.cppreference.com/w/cpp/utility/functional/function).
## Currently supported compilers
* g++ 4.8 or later
* clang++ 3.9 or later
* Visual Studio 2005-2022
Tested on [Github Actions](https://github.com/boostorg/function/actions) and [Appveyor](https://ci.appveyor.com/project/pdimov/function/).
## License
Distributed under the [Boost Software License, Version 1.0](http://boost.org/LICENSE_1_0.txt).

View File

@@ -1,70 +0,0 @@
# Copyright 2016-2019 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)
version: 1.0.{build}-{branch}
shallow_clone: true
branches:
only:
- master
- develop
- /feature\/.*/
environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
ADDRMD: 32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-12.0,msvc-14.0
ADDRMD: 32,64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
TOOLSET: msvc-14.1
CXXSTD: 14,17
ADDRMD: 32,64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
TOOLSET: clang-win
CXXSTD: 14,17,latest
ADDRMD: 64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
TOOLSET: clang-win
CXXSTD: 14,17,latest
ADDRMD: 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
- if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master
- cd ..
- git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root
- git submodule update --init tools/boostdep
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\function\
- python tools/boostdep/depinst/depinst.py function
- cmd /c bootstrap
- b2 -d0 headers
build: off
test_script:
- PATH=%ADDPATH%%PATH%
- if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
- if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
- b2 -j3 libs/function/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% variant=debug,release embed-manifest-via=linker

View File

@@ -1,25 +1,5 @@
# Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com> project boost/doc ;
# 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)
project function/doc ;
import boostbook : boostbook ; import boostbook : boostbook ;
boostbook function-doc boostbook function-doc : function.xml ;
:
function.xml
:
<xsl:param>boost.root=../../../..
<format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
;
###############################################################################
alias boostdoc
: function.xml
:
:
: ;
explicit boostdoc ;
alias boostrelease ;
explicit boostrelease ;

View File

@@ -1,11 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
-->
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd"> "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<section id="function.faq" last-revision="$Date$"> <section id="function.faq" last-revision="$Date$">

View File

@@ -1,70 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
-->
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd"> "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<section id="function.history" last-revision="$Date$"> <section id="function.history" last-revision="$Date$">
<title>History &amp; Compatibility Notes</title> <title>History &amp; Compatibility Notes</title>
<itemizedlist spacing="compact"> <itemizedlist spacing="compact">
<listitem><para><emphasis role="bold">Version 1.30.0</emphasis>: </para>
<listitem><para><bold>Version 1.52.0</bold>: </para>
<itemizedlist spacing="compact">
<listitem><para>Move constructors and move assignment
operators added (only for compilers with C++11 rvalue
references support). Original patch
contributed by Antony Polukhin.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para><bold>Version 1.37.0</bold>: </para>
<itemizedlist spacing="compact">
<listitem><para>Improved the performance of Boost.Function's
swap() operation for large function objects. Original patch
contributed by Niels Dekker.</para></listitem>
<listitem><para>Added a new header &lt;boost/function/function_typeof.hpp&gt; that provides support for using the Boost.Typeof library on Boost.Function objects.</para></listitem>
<listitem><para>Added a new header &lt;boost/function/function_fwd.hpp&gt; that provides support for using the Boost.Typeof library on Boost.Function objects.</para></listitem>
<listitem><para>The <methodname alt="boost::function::target">target</methodname>()
function now respects the cv-qualifiers of function objects
stored by reference
(using <classname>boost::reference_wrapper</classname>), such
that a reference to a <code>const</code> function object cannot
be accessed as a reference to a non-<code>const</code> function
object.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para><bold>Version 1.36.0</bold>: </para>
<itemizedlist spacing="compact">
<listitem><para>Boost.Function now implements allocator support
in the same way that is is provided in C++0x, based on C++
committee
proposal <ulink url="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2308.html">N2308</ulink>. This
change removes the <computeroutput>Allocator</computeroutput>
template parameter of <classname>boost::function</classname> in
favor of a constructor that takes an argument. While this is a
backward-incompatible change, it is likely to affect only a few
users. This change to Function was contributed by Emil
Dotchevski, which also authored the corresponding C++ committee
proposal.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para><bold>Version 1.34.0</bold>: </para>
<itemizedlist spacing="compact">
<listitem><para>Boost.Function now implements a small buffer optimization, which can drastically improve the performance when copying or construction Boost.Function objects storing small function objects. For instance, <code>bind(&amp;X:foo, &amp;x, _1, _2)</code> requires no heap allocation when placed into a Boost.Function object. Note that some exception-safety guarantees have changed: assignment provides the basic exception guarantee and <code>swap()</code> may throw.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para><bold>Version 1.30.0</bold>: </para>
<itemizedlist spacing="compact"> <itemizedlist spacing="compact">
<listitem><para>All features deprecated in version 1.29.0 have <listitem><para>All features deprecated in version 1.29.0 have
been removed from Boost.Function.</para></listitem> been removed from Boost.Function.</para></listitem>
@@ -91,7 +32,7 @@
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem><para><bold>Version 1.29.0</bold>: <listitem><para><emphasis role="bold">Version 1.29.0</emphasis>:
Boost.Function has been partially redesigned to minimize the Boost.Function has been partially redesigned to minimize the
interface and make it cleaner. Several seldom- or never-used interface and make it cleaner. Several seldom- or never-used
features of the older Boost.Function have been deprecated and will features of the older Boost.Function have been deprecated and will

View File

@@ -1,11 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
-->
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd"> "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<section id="function.misc" last-revision="$Date$"> <section id="function.misc" last-revision="$Date$">
@@ -24,7 +17,7 @@
<para> And, of course, function pointers have several advantages over Boost.Function: <para> And, of course, function pointers have several advantages over Boost.Function:
<itemizedlist spacing="compact"> <itemizedlist spacing="compact">
<listitem><para> Function pointers are smaller (the size of one pointer instead of four or more) </para></listitem> <listitem><para> Function pointers are smaller (the size of one pointer instead of three) </para></listitem>
<listitem><para> Function pointers are faster (Boost.Function may require two calls through function pointers) </para></listitem> <listitem><para> Function pointers are faster (Boost.Function may require two calls through function pointers) </para></listitem>
<listitem><para> Function pointers are backward-compatible with C libraries.</para></listitem> <listitem><para> Function pointers are backward-compatible with C libraries.</para></listitem>
<listitem><para> More readable error messages. </para></listitem> <listitem><para> More readable error messages. </para></listitem>
@@ -37,12 +30,12 @@
<section> <section>
<title>Function object wrapper size</title> <title>Function object wrapper size</title>
<para> Function object wrappers will be the size of a struct containing a member function pointer and two data pointers. The actual size can vary significantly depending on the underlying platform; on 32-bit Mac OS X with GCC, this amounts to 16 bytes, while it is 32 bytes Windows with Visual C++. Additionally, the function object target may be allocated on the heap, if it cannot be placed into the small-object buffer in the <code>boost::function</code> object.</para> <para> Function object wrappers will be the size of two function pointers plus one function pointer or data pointer (whichever is larger). On common 32-bit platforms, this amounts to 12 bytes per wrapper. Additionally, the function object target will be allocated on the heap.</para>
</section> </section>
<section> <section>
<title>Copying efficiency</title> <title>Copying efficiency</title>
<para> Copying function object wrappers may require allocating memory for a copy of the function object target. The default allocator may be replaced with a faster custom allocator or one may choose to allow the function object wrappers to only store function object targets by reference (using <computeroutput>ref</computeroutput>) if the cost of this cloning becomes prohibitive. Small function objects can be stored within the <code>boost::function</code> object itself, improving copying efficiency.</para> <para> Copying function object wrappers may require allocating memory for a copy of the function object target. The default allocator may be replaced with a faster custom allocator or one may choose to allow the function object wrappers to only store function object targets by reference (using <computeroutput>ref</computeroutput>) if the cost of this cloning becomes prohibitive.</para>
</section> </section>
<section> <section>

View File

@@ -1,11 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
-->
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd"> "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
@@ -58,7 +51,7 @@
<para>A function object <code>f</code> of <para>A function object <code>f</code> of
type <code>F</code> is type <code>F</code> is
<emphasis>stateless</emphasis> if it is a function pointer or if <emphasis>stateless</emphasis> if it is a function pointer or if
<code><classname>boost::is_stateless</classname>&lt;F&gt;</code> <code><classname>boost::is_stateless</classname>&lt;T&gt;</code>
is true. The construction of or copy to a Boost.Function object is true. The construction of or copy to a Boost.Function object
from a stateless function object will not cause exceptions to be from a stateless function object will not cause exceptions to be
thrown and will not allocate any storage. thrown and will not allocate any storage.
@@ -125,12 +118,6 @@
<returns><simpara><code>true</code> if <code>this-&gt;<methodname>target</methodname>&lt;Functor&gt;()</code> is non-NULL and <code><functionname>function_equal</functionname>(*(this-&gt;target&lt;Functor&gt;()), f)</code></simpara></returns> <returns><simpara><code>true</code> if <code>this-&gt;<methodname>target</methodname>&lt;Functor&gt;()</code> is non-NULL and <code><functionname>function_equal</functionname>(*(this-&gt;target&lt;Functor&gt;()), f)</code></simpara></returns>
</method> </method>
<method name="target_type" cv="const">
<type>const std::type_info&amp;</type>
<returns><simpara><code>typeid</code> of the target function object, or <code>typeid(void)</code> if <code>this-&gt;<methodname>empty</methodname>()</code>. Works even with RTTI off.</simpara></returns>
<throws><simpara>Will not throw.</simpara></throws>
</method>
</method-group> </method-group>
</class> </class>
@@ -141,6 +128,9 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator">
<default><classname>std::allocator</classname>&lt;void&gt;</default>
</template-type-parameter>
</template> </template>
<inherit access="public"><classname>function_base</classname></inherit> <inherit access="public"><classname>function_base</classname></inherit>
@@ -157,6 +147,7 @@
</description> </description>
<typedef name="result_type"><type>R</type></typedef> <typedef name="result_type"><type>R</type></typedef>
<typedef name="allocator_type"><type>Allocator</type></typedef>
<typedef name="argument_type"> <typedef name="argument_type">
<type>T1</type><purpose>If N == 1</purpose> <type>T1</type><purpose>If N == 1</purpose>
</typedef> </typedef>
@@ -191,7 +182,7 @@
</struct> </struct>
<constructor> <constructor>
<postconditions><simpara><code>this-&gt;<methodname>empty</methodname>()</code></simpara></postconditions> <postconditions><simpara><code>this-><methodname>empty</methodname>()</code></simpara></postconditions>
<throws><simpara>Will not throw.</simpara></throws> <throws><simpara>Will not throw.</simpara></throws>
</constructor> </constructor>
@@ -203,15 +194,6 @@
<throws><simpara>Will not throw unless copying the target of <code>f</code> throws.</simpara></throws> <throws><simpara>Will not throw unless copying the target of <code>f</code> throws.</simpara></throws>
</constructor> </constructor>
<constructor>
<parameter name="f">
<paramtype><classname>functionN</classname>&amp;&amp;</paramtype>
</parameter>
<requires><simpara>C++11 compatible compiler.</simpara></requires>
<postconditions><simpara>Moves the value from <code>f</code> to <code>*this</code>. If the argument has its function object allocated on the heap, its buffer will be assigned to <code>*this</code> leaving argument empty.</simpara></postconditions>
<throws><simpara>Will not throw unless argument has its function object allocated not on the heap and copying the target of <code>f</code> throws.</simpara></throws>
</constructor>
<constructor> <constructor>
<template> <template>
<template-type-parameter name="F"/> <template-type-parameter name="F"/>
@@ -219,23 +201,11 @@
<parameter name="f"><paramtype>F</paramtype></parameter> <parameter name="f"><paramtype>F</paramtype></parameter>
<requires><simpara>F is a function object Callable from <code>this</code>.</simpara></requires> <requires><simpara>F is a function object Callable from <code>this</code>.</simpara></requires>
<postconditions><simpara><code>*this</code> targets a copy of <code>f</code> if <code>f</code> is nonempty, or <code>this-&gt;<methodname>empty</methodname>()</code> if <code>f</code> is empty.</simpara></postconditions> <postconditions><simpara><code>*this</code> targets a copy of <code>f</code> if <code>f</code> is nonempty, or <code>this-&gt;<methodname>empty</methodname>()</code> if <code>f</code> is empty.</simpara></postconditions>
</constructor> <throws><simpara>Will not throw when <code>f</code> is a stateless function object.</simpara></throws>
<constructor>
<template>
<template-type-parameter name="F"/>
<template-type-parameter name="Allocator"/>
</template>
<parameter name="f"><paramtype>F</paramtype></parameter>
<parameter name="alloc"><paramtype>Allocator</paramtype></parameter>
<requires><simpara>F is a function object Callable from <code>this</code>, Allocator is an allocator. The copy constructor and destructor of Allocator shall not throw.</simpara></requires>
<postconditions><simpara><code>*this</code> targets a copy of <code>f</code> if <code>f</code> is nonempty, or <code>this-&gt;<methodname>empty</methodname>()</code> if <code>f</code> is empty.</simpara></postconditions>
<effects><simpara>If memory allocation is required, the given allocator (or a copy of it) will be used to allocate that memory.</simpara></effects>
</constructor> </constructor>
<destructor> <destructor>
<effects><simpara>If <code>!this-&gt;<methodname>empty</methodname>()</code>, destroys the target of this.</simpara></effects> <effects><simpara>If <code>!this-><methodname>empty</methodname>()</code>, destroys the target of this.</simpara></effects>
</destructor> </destructor>
@@ -243,16 +213,8 @@
<parameter name="f"> <parameter name="f">
<paramtype>const <classname>functionN</classname>&amp;</paramtype> <paramtype>const <classname>functionN</classname>&amp;</paramtype>
</parameter> </parameter>
<postconditions><simpara>If copy construction does not throw, <code>*this</code> targets a copy of <code>f</code>'s target, if it has one, or is empty if <code>f.<methodname>empty</methodname>()</code>. If copy construction does throw, <code>this-&gt;<methodname>empty</methodname>()</code>.</simpara></postconditions> <postconditions><simpara><code>*this</code> targets a copy of <code>f</code>'s target, if it has one, or is empty if <code>f.<methodname>empty</methodname>()</code>.</simpara></postconditions>
</copy-assignment> <throws><simpara>Will not throw when the target of <code>f</code> is a stateless function object or a reference to the function object.</simpara></throws>
<copy-assignment>
<parameter name="f">
<paramtype><classname>functionN</classname>&amp;&amp;</paramtype>
</parameter>
<requires><simpara>C++11 compatible compiler.</simpara></requires>
<postconditions><simpara>Moves the value from <code>f</code> to <code>*this</code>. If the argument has its function object allocated on the heap, its buffer will be assigned to <code>*this</code> leaving argument empty.</simpara></postconditions>
<throws><simpara>Will not throw unless argument has its function object allocated not on the heap and copying the target of <code>f</code> throws.</simpara></throws>
</copy-assignment> </copy-assignment>
<method-group name="modifiers"> <method-group name="modifiers">
@@ -260,11 +222,13 @@
<type>void</type> <type>void</type>
<parameter name="f"><paramtype>const <classname>functionN</classname>&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>functionN</classname>&amp;</paramtype></parameter>
<effects><simpara>Interchanges the targets of <code>*this</code> and <code>f</code>.</simpara></effects> <effects><simpara>Interchanges the targets of <code>*this</code> and <code>f</code>.</simpara></effects>
<throws><simpara>Will not throw.</simpara></throws>
</method> </method>
<method name="clear"> <method name="clear">
<type>void</type> <type>void</type>
<postconditions><simpara>this-&gt;<methodname>empty</methodname>()</simpara></postconditions> <postconditions><simpara>this-&gt;<methodname>empty</methodname>()</simpara></postconditions>
<throws><simpara>Will not throw.</simpara></throws>
</method> </method>
</method-group> </method-group>
@@ -322,13 +286,6 @@
<returns><simpara><code>true</code> if <code>this-&gt;<methodname>target</methodname>&lt;Functor&gt;()</code> is non-NULL and <code><functionname>function_equal</functionname>(*(this-&gt;target&lt;Functor&gt;()), f)</code></simpara></returns> <returns><simpara><code>true</code> if <code>this-&gt;<methodname>target</methodname>&lt;Functor&gt;()</code> is non-NULL and <code><functionname>function_equal</functionname>(*(this-&gt;target&lt;Functor&gt;()), f)</code></simpara></returns>
</method> </method>
<method name="target_type" cv="const">
<type>const std::type_info&amp;</type>
<returns><simpara><code>typeid</code> of the target function object, or <code>typeid(void)</code> if <code>this-&gt;<methodname>empty</methodname>()</code>.</simpara></returns>
<throws><simpara>Will not throw.</simpara></throws>
</method>
</method-group> </method-group>
<method-group name="invocation"> <method-group name="invocation">
@@ -340,7 +297,7 @@
<parameter name="aN"><paramtype>argN_type</paramtype></parameter> <parameter name="aN"><paramtype>argN_type</paramtype></parameter>
<effects><simpara><code>f(a1, a2, ..., aN)</code>, where <code>f</code> is the target of <code>*this</code>.</simpara></effects> <effects><simpara><code>f(a1, a2, ..., aN)</code>, where <code>f</code> is the target of <code>*this</code>.</simpara></effects>
<returns><simpara>if <code>R</code> is <code>void</code>, nothing is returned; otherwise, the return value of the call to <code>f</code> is returned.</simpara></returns> <returns><simpara>if <code>R</code> is <code>void</code>, nothing is returned; otherwise, the return value of the call to <code>f</code> is returned.</simpara></returns>
<throws><simpara><code><classname>bad_function_call</classname></code> if <code>this-&gt;<methodname>empty</methodname>()</code>. Otherwise, may through any exception thrown by the target function <code>f</code>.</simpara></throws> <throws><simpara><code><classname>bad_function_call</classname></code> if <code>!this-&gt;<methodname>empty</methodname>()</code>. Otherwise, may through any exception thrown by the target function <code>f</code>.</simpara></throws>
</method> </method>
</method-group> </method-group>
@@ -351,11 +308,13 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator"/>
</template> </template>
<type>void</type> <type>void</type>
<parameter name="f1"><paramtype><classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f1"><paramtype><classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="f2"><paramtype><classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f2"><paramtype><classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
<effects><simpara><code>f1.<methodname>swap</methodname>(f2)</code></simpara></effects> <effects><simpara><code>f1.<methodname>swap</methodname>(f2)</code></simpara></effects>
<throws><simpara>Will not throw.</simpara></throws>
</function> </function>
</free-function-group> </free-function-group>
@@ -367,10 +326,11 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="g"><paramtype>Functor</paramtype></parameter> <parameter name="g"><paramtype>Functor</paramtype></parameter>
</signature> </signature>
<signature> <signature>
@@ -379,11 +339,12 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="g"><paramtype>Functor</paramtype></parameter> <parameter name="g"><paramtype>Functor</paramtype></parameter>
<parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
@@ -391,10 +352,11 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter> <parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
@@ -403,11 +365,12 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter> <parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter>
<parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
@@ -415,14 +378,16 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator1"/>
<template-type-parameter name="U1"/> <template-type-parameter name="U1"/>
<template-type-parameter name="U2"/> <template-type-parameter name="U2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="UN"/> <template-type-parameter name="UN"/>
<template-type-parameter name="Allocator2"/>
</template> </template>
<type>void</type> <type>void</type>
<parameter name="f1"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f1"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator1&gt;&amp;</paramtype></parameter>
<parameter name="f2"><paramtype>const <classname>functionN</classname>&lt;U1, U2, ..., UN&gt;&amp;</paramtype></parameter> <parameter name="f2"><paramtype>const <classname>functionN</classname>&lt;U1, U2, ..., UN, Allocator2&gt;&amp;</paramtype></parameter>
</signature> </signature>
<returns><simpara>True when <code>f</code> stores an object of <returns><simpara>True when <code>f</code> stores an object of
@@ -462,10 +427,11 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="g"><paramtype>Functor</paramtype></parameter> <parameter name="g"><paramtype>Functor</paramtype></parameter>
</signature> </signature>
<signature> <signature>
@@ -474,11 +440,12 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="g"><paramtype>Functor</paramtype></parameter> <parameter name="g"><paramtype>Functor</paramtype></parameter>
<parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
@@ -486,10 +453,11 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter> <parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
@@ -498,11 +466,12 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter> <parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter>
<parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator&gt;&amp;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
@@ -510,14 +479,16 @@
<template-type-parameter name="T2"/> <template-type-parameter name="T2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="TN"/> <template-type-parameter name="TN"/>
<template-type-parameter name="Allocator1"/>
<template-type-parameter name="U1"/> <template-type-parameter name="U1"/>
<template-type-parameter name="U2"/> <template-type-parameter name="U2"/>
<template-varargs/> <template-varargs/>
<template-type-parameter name="UN"/> <template-type-parameter name="UN"/>
<template-type-parameter name="Allocator2"/>
</template> </template>
<type>void</type> <type>void</type>
<parameter name="f1"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN&gt;&amp;</paramtype></parameter> <parameter name="f1"><paramtype>const <classname>functionN</classname>&lt;T1, T2, ..., TN, Allocator1&gt;&amp;</paramtype></parameter>
<parameter name="f2"><paramtype>const <classname>functionN</classname>&lt;U1, U2, ..., UN&gt;&amp;</paramtype></parameter> <parameter name="f2"><paramtype>const <classname>functionN</classname>&lt;U1, U2, ..., UN, Allocator2&gt;&amp;</paramtype></parameter>
</signature> </signature>
<returns><simpara>True when <code>f</code> does not store an <returns><simpara>True when <code>f</code> does not store an
@@ -557,8 +528,11 @@
<template-type-parameter name="Signature"> <template-type-parameter name="Signature">
<purpose>Function type R (T1, T2, ..., TN)</purpose> <purpose>Function type R (T1, T2, ..., TN)</purpose>
</template-type-parameter> </template-type-parameter>
<template-type-parameter name="Allocator">
<default><classname>std::allocator</classname>&lt;void&gt;</default>
</template-type-parameter>
</template> </template>
<inherit access="public"><classname>functionN</classname>&lt;R, T1, T2, ..., TN&gt;</inherit> <inherit access="public"><classname>functionN</classname>&lt;R, T1, T2, ..., TN, Allocator&gt;</inherit>
<purpose>A generalized function pointer that can be used for <purpose>A generalized function pointer that can be used for
callbacks or wrapping function objects.</purpose> callbacks or wrapping function objects.</purpose>
@@ -580,6 +554,7 @@
</description> </description>
<typedef name="result_type"><type>R</type></typedef> <typedef name="result_type"><type>R</type></typedef>
<typedef name="allocator_type"><type>Allocator</type></typedef>
<typedef name="argument_type"> <typedef name="argument_type">
<type>T1</type><purpose>If N == 1</purpose> <type>T1</type><purpose>If N == 1</purpose>
</typedef> </typedef>
@@ -614,7 +589,7 @@
</struct> </struct>
<constructor> <constructor>
<postconditions><simpara><code>this-&gt;<methodname>empty</methodname>()</code></simpara></postconditions> <postconditions><simpara><code>this-><methodname>empty</methodname>()</code></simpara></postconditions>
<throws><simpara>Will not throw.</simpara></throws> <throws><simpara>Will not throw.</simpara></throws>
</constructor> </constructor>
@@ -626,15 +601,6 @@
<throws><simpara>Will not throw unless copying the target of <code>f</code> throws.</simpara></throws> <throws><simpara>Will not throw unless copying the target of <code>f</code> throws.</simpara></throws>
</constructor> </constructor>
<constructor>
<parameter name="f">
<paramtype><classname>functionN</classname>&amp;&amp;</paramtype>
</parameter>
<requires><simpara>C++11 compatible compiler.</simpara></requires>
<postconditions><simpara>Moves the value from <code>f</code> to <code>*this</code>. If the argument has its function object allocated on the heap, its buffer will be assigned to <code>*this</code> leaving argument empty.</simpara></postconditions>
<throws><simpara>Will not throw unless argument has its function object allocated not on the heap and copying the target of <code>f</code> throws.</simpara></throws>
</constructor>
<constructor> <constructor>
<parameter name="f"> <parameter name="f">
<paramtype>const <classname>function</classname>&amp;</paramtype> <paramtype>const <classname>function</classname>&amp;</paramtype>
@@ -643,15 +609,6 @@
<throws><simpara>Will not throw unless copying the target of <code>f</code> throws.</simpara></throws> <throws><simpara>Will not throw unless copying the target of <code>f</code> throws.</simpara></throws>
</constructor> </constructor>
<constructor>
<parameter name="f">
<paramtype><classname>function</classname>&amp;&amp;</paramtype>
</parameter>
<requires><simpara>C++11 compatible compiler.</simpara></requires>
<postconditions><simpara>Moves the value from <code>f</code> to <code>*this</code>. If the argument has its function object allocated on the heap, its buffer will be assigned to <code>*this</code> leaving argument empty.</simpara></postconditions>
<throws><simpara>Will not throw unless argument has its function object allocated not on the heap and copying the target of <code>f</code> throws.</simpara></throws>
</constructor>
<constructor> <constructor>
<template> <template>
<template-type-parameter name="F"/> <template-type-parameter name="F"/>
@@ -659,23 +616,11 @@
<parameter name="f"><paramtype>F</paramtype></parameter> <parameter name="f"><paramtype>F</paramtype></parameter>
<requires><simpara>F is a function object Callable from <code>this</code>.</simpara></requires> <requires><simpara>F is a function object Callable from <code>this</code>.</simpara></requires>
<postconditions><simpara><code>*this</code> targets a copy of <code>f</code> if <code>f</code> is nonempty, or <code>this-&gt;<methodname>empty</methodname>()</code> if <code>f</code> is empty.</simpara></postconditions> <postconditions><simpara><code>*this</code> targets a copy of <code>f</code> if <code>f</code> is nonempty, or <code>this-&gt;<methodname>empty</methodname>()</code> if <code>f</code> is empty.</simpara></postconditions>
</constructor> <throws><simpara>Will not throw when <code>f</code> is a stateless function object.</simpara></throws>
<constructor>
<template>
<template-type-parameter name="F"/>
<template-type-parameter name="Allocator"/>
</template>
<parameter name="f"><paramtype>F</paramtype></parameter>
<parameter name="alloc"><paramtype>Allocator</paramtype></parameter>
<requires><simpara>F is a function object Callable from <code>this</code>, Allocator is an allocator. The copy constructor and destructor of Allocator shall not throw.</simpara></requires>
<postconditions><simpara><code>*this</code> targets a copy of <code>f</code> if <code>f</code> is nonempty, or <code>this-&gt;<methodname>empty</methodname>()</code> if <code>f</code> is empty.</simpara></postconditions>
<effects><simpara>If memory allocation is required, the given allocator (or a copy of it) will be used to allocate that memory.</simpara></effects>
</constructor> </constructor>
<destructor> <destructor>
<effects><simpara>If <code>!this-&gt;<methodname>empty</methodname>()</code>, destroys the target of <code>this</code>.</simpara></effects> <effects><simpara>If <code>!this-><methodname>empty</methodname>()</code>, destroys the target of <code>this</code>.</simpara></effects>
</destructor> </destructor>
@@ -683,33 +628,16 @@
<parameter name="f"> <parameter name="f">
<paramtype>const <classname>functionN</classname>&amp;</paramtype> <paramtype>const <classname>functionN</classname>&amp;</paramtype>
</parameter> </parameter>
<postconditions><simpara>If copy construction does not throw, <code>*this</code> targets a copy of <code>f</code>'s target, if it has one, or is empty if <code>f.<methodname>empty</methodname>()</code>. If copy construction does throw, <code>this-&gt;<methodname>empty</methodname>()</code>.</simpara></postconditions> <postconditions><simpara><code>*this</code> targets a copy of <code>f</code>'s target, if it has one, or is empty if <code>f.<methodname>empty</methodname>()</code></simpara></postconditions>
</copy-assignment> <throws><simpara>Will not throw when the target of <code>f</code> is a stateless function object or a reference to the function object.</simpara></throws>
<copy-assignment>
<parameter name="f">
<paramtype><classname>functionN</classname>&amp;&amp;</paramtype>
</parameter>
<requires><simpara>C++11 compatible compiler.</simpara></requires>
<postconditions><simpara>Moves the value from <code>f</code> to <code>*this</code>. If the argument has its function object allocated on the heap, its buffer will be assigned to <code>*this</code> leaving argument empty.</simpara></postconditions>
<throws><simpara>Will not throw unless argument has its function object allocated not on the heap and copying the target of <code>f</code> throws.</simpara></throws>
</copy-assignment> </copy-assignment>
<copy-assignment> <copy-assignment>
<parameter name="f"> <parameter name="f">
<paramtype>const <classname>function</classname>&amp;</paramtype> <paramtype>const <classname>function</classname>&amp;</paramtype>
</parameter> </parameter>
<postconditions><simpara>If copy construction of the target of <code>f</code> does not throw, <code>*this</code> targets a copy of <code>f</code>'s target, if it has one, or is empty if <code>f.<methodname>empty</methodname>()</code>. </simpara></postconditions> <postconditions><simpara><code>*this</code> targets a copy of <code>f</code>'s target, if it has one, or is empty if <code>f.<methodname>empty</methodname>()</code></simpara></postconditions>
<throws><simpara>Will not throw when the target of <code>f</code> is a stateless function object or a reference to the function object. If copy construction does throw, <code>this-&gt;<methodname>empty</methodname>()</code>.</simpara></throws> <throws><simpara>Will not throw when the target of <code>f</code> is a stateless function object or a reference to the function object.</simpara></throws>
</copy-assignment>
<copy-assignment>
<parameter name="f">
<paramtype><classname>function</classname>&amp;&amp;</paramtype>
</parameter>
<requires><simpara>C++11 compatible compiler.</simpara></requires>
<postconditions><simpara>Moves the value from <code>f</code> to <code>*this</code>. If the argument has its function object allocated on the heap, its buffer will be assigned to <code>*this</code> leaving argument empty.</simpara></postconditions>
<throws><simpara>Will not throw unless argument has its function object allocated not on the heap and copying the target of <code>f</code> throws.</simpara></throws>
</copy-assignment> </copy-assignment>
<method-group name="modifiers"> <method-group name="modifiers">
@@ -717,6 +645,7 @@
<type>void</type> <type>void</type>
<parameter name="f"><paramtype>const <classname>function</classname>&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>function</classname>&amp;</paramtype></parameter>
<effects><simpara>Interchanges the targets of <code>*this</code> and <code>f</code>.</simpara></effects> <effects><simpara>Interchanges the targets of <code>*this</code> and <code>f</code>.</simpara></effects>
<throws><simpara>Will not throw.</simpara></throws>
</method> </method>
<method name="clear"> <method name="clear">
@@ -779,12 +708,6 @@
<returns><simpara><code>true</code> if <code>this-&gt;<methodname>target</methodname>&lt;Functor&gt;()</code> is non-NULL and <code><functionname>function_equal</functionname>(*(this-&gt;target&lt;Functor&gt;()), f)</code></simpara></returns> <returns><simpara><code>true</code> if <code>this-&gt;<methodname>target</methodname>&lt;Functor&gt;()</code> is non-NULL and <code><functionname>function_equal</functionname>(*(this-&gt;target&lt;Functor&gt;()), f)</code></simpara></returns>
</method> </method>
<method name="target_type" cv="const">
<type>const std::type_info&amp;</type>
<returns><simpara><code>typeid</code> of the target function object, or <code>typeid(void)</code> if <code>this-&gt;<methodname>empty</methodname>()</code>.</simpara></returns>
<throws><simpara>Will not throw.</simpara></throws>
</method>
</method-group> </method-group>
<method-group name="invocation"> <method-group name="invocation">
@@ -796,7 +719,7 @@
<parameter name="aN"><paramtype>argN_type</paramtype></parameter> <parameter name="aN"><paramtype>argN_type</paramtype></parameter>
<effects><simpara><code>f(a1, a2, ..., aN)</code>, where <code>f</code> is the target of <code>*this</code>.</simpara></effects> <effects><simpara><code>f(a1, a2, ..., aN)</code>, where <code>f</code> is the target of <code>*this</code>.</simpara></effects>
<returns><simpara>if <code>R</code> is <code>void</code>, nothing is returned; otherwise, the return value of the call to <code>f</code> is returned.</simpara></returns> <returns><simpara>if <code>R</code> is <code>void</code>, nothing is returned; otherwise, the return value of the call to <code>f</code> is returned.</simpara></returns>
<throws><simpara><code><classname>bad_function_call</classname></code> if <code>this-&gt;<methodname>empty</methodname>()</code>. Otherwise, may through any exception thrown by the target function <code>f</code>.</simpara></throws> <throws><simpara><code><classname>bad_function_call</classname></code> if <code>!this-&gt;<methodname>empty</methodname>()</code>. Otherwise, may through any exception thrown by the target function <code>f</code>.</simpara></throws>
</method> </method>
</method-group> </method-group>
@@ -804,11 +727,13 @@
<function name="swap"> <function name="swap">
<template> <template>
<template-type-parameter name="Signature"/> <template-type-parameter name="Signature"/>
<template-type-parameter name="Allocator"/>
</template> </template>
<type>void</type> <type>void</type>
<parameter name="f1"><paramtype><classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f1"><paramtype><classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="f2"><paramtype><classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f2"><paramtype><classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
<effects><simpara><code>f1.<methodname>swap</methodname>(f2)</code></simpara></effects> <effects><simpara><code>f1.<methodname>swap</methodname>(f2)</code></simpara></effects>
<throws><simpara>Will not throw.</simpara></throws>
</function> </function>
</free-function-group> </free-function-group>
@@ -817,47 +742,53 @@
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature"/> <template-type-parameter name="Signature"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="g"><paramtype>Functor</paramtype></parameter> <parameter name="g"><paramtype>Functor</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature"/> <template-type-parameter name="Signature"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="g"><paramtype>Functor</paramtype></parameter> <parameter name="g"><paramtype>Functor</paramtype></parameter>
<parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature"/> <template-type-parameter name="Signature"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter> <parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature"/> <template-type-parameter name="Signature"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter> <parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter>
<parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature1"/> <template-type-parameter name="Signature1"/>
<template-type-parameter name="Allocator1"/>
<template-type-parameter name="Signature2"/> <template-type-parameter name="Signature2"/>
<template-type-parameter name="Allocator2"/>
</template> </template>
<type>void</type> <type>void</type>
<parameter name="f1"><paramtype>const <classname>function</classname>&lt;Signature1&gt;&amp;</paramtype></parameter> <parameter name="f1"><paramtype>const <classname>function</classname>&lt;Signature1, Allocator1&gt;&amp;</paramtype></parameter>
<parameter name="f2"><paramtype>const <classname>function</classname>&lt;Signature2&gt;&amp;</paramtype></parameter> <parameter name="f2"><paramtype>const <classname>function</classname>&lt;Signature2, Allocator2&gt;&amp;</paramtype></parameter>
</signature> </signature>
<returns><simpara>True when <code>f</code> stores an object of <returns><simpara>True when <code>f</code> stores an object of
@@ -892,47 +823,53 @@
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature"/> <template-type-parameter name="Signature"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="g"><paramtype>Functor</paramtype></parameter> <parameter name="g"><paramtype>Functor</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature"/> <template-type-parameter name="Signature"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="g"><paramtype>Functor</paramtype></parameter> <parameter name="g"><paramtype>Functor</paramtype></parameter>
<parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature"/> <template-type-parameter name="Signature"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
<parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter> <parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature"/> <template-type-parameter name="Signature"/>
<template-type-parameter name="Allocator"/>
<template-type-parameter name="Functor"/> <template-type-parameter name="Functor"/>
</template> </template>
<type>bool</type> <type>bool</type>
<parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter> <parameter name="g"><paramtype><classname>reference_wrapper</classname>&lt;Functor&gt;</paramtype></parameter>
<parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature&gt;&amp;</paramtype></parameter> <parameter name="f"><paramtype>const <classname>function</classname>&lt;Signature, Allocator&gt;&amp;</paramtype></parameter>
</signature> </signature>
<signature> <signature>
<template> <template>
<template-type-parameter name="Signature1"/> <template-type-parameter name="Signature1"/>
<template-type-parameter name="Allocator1"/>
<template-type-parameter name="Signature2"/> <template-type-parameter name="Signature2"/>
<template-type-parameter name="Allocator2"/>
</template> </template>
<type>void</type> <type>void</type>
<parameter name="f1"><paramtype>const <classname>function</classname>&lt;Signature1&gt;&amp;</paramtype></parameter> <parameter name="f1"><paramtype>const <classname>function</classname>&lt;Signature1, Allocator1&gt;&amp;</paramtype></parameter>
<parameter name="f2"><paramtype>const <classname>function</classname>&lt;Signature2&gt;&amp;</paramtype></parameter> <parameter name="f2"><paramtype>const <classname>function</classname>&lt;Signature2, Allocator2&gt;&amp;</paramtype></parameter>
</signature> </signature>
<returns><simpara>True when <code>f</code> does not store an <returns><simpara>True when <code>f</code> does not store an

View File

@@ -1,11 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
-->
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd"> "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<testsuite id="function.testsuite" last-revision="$Date$"> <testsuite id="function.testsuite" last-revision="$Date$">

View File

@@ -1,11 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
-->
<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
"http://www.boost.org/tools/boostbook/dtd/boostbook.dtd"> "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
<section xmlns:xi="http://www.w3.org/2001/XInclude" id="function.tutorial" <section xmlns:xi="http://www.w3.org/2001/XInclude" id="function.tutorial"
@@ -35,12 +28,12 @@ form to use for your compiler.
<row> <row>
<entry> <entry>
<itemizedlist spacing="compact"> <itemizedlist spacing="compact">
<listitem><simpara>GNU C++ 2.95.x, 3.0.x and later versions</simpara></listitem> <listitem><simpara>GNU C++ 2.95.x, 3.0.x, 3.1.x</simpara></listitem>
<listitem><simpara>Comeau C++ 4.2.45.2</simpara></listitem> <listitem><simpara>Comeau C++ 4.2.45.2</simpara></listitem>
<listitem><simpara>SGI MIPSpro 7.3.0</simpara></listitem> <listitem><simpara>SGI MIPSpro 7.3.0</simpara></listitem>
<listitem><simpara>Intel C++ 5.0, 6.0</simpara></listitem> <listitem><simpara>Intel C++ 5.0, 6.0</simpara></listitem>
<listitem><simpara>Compaq's cxx 6.2</simpara></listitem> <listitem><simpara>Compaq's cxx 6.2</simpara></listitem>
<listitem><simpara>Microsoft Visual C++ 7.1 and later versions</simpara></listitem> <listitem><simpara>Microsoft Visual C++ 7.1</simpara></listitem>
</itemizedlist> </itemizedlist>
</entry> </entry>
<entry> <entry>
@@ -336,8 +329,8 @@ exceptions during assignment or construction.
or <code>!=</code> against any function object that can be stored or <code>!=</code> against any function object that can be stored
within the wrapper. If the function object wrapper contains a within the wrapper. If the function object wrapper contains a
function object of that type, it will be compared against the given function object of that type, it will be compared against the given
function object (which must be either be function object (which must be
<conceptname>EqualityComparable</conceptname> or have an overloaded <functionname>boost::function_equal</functionname>). For instance:</para> <conceptname>EqualityComparable</conceptname>). For instance:</para>
<programlisting name="function.tutorial.compare">int compute_with_X(X*, int); <programlisting name="function.tutorial.compare">int compute_with_X(X*, int);

View File

@@ -1,14 +0,0 @@
# Boost.Function Library example Jamfile
#
# Copyright (c) 2008 James E. King III
#
# 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 ../../config/checks/config : requires ;
import testing ;
run bind1st.cpp : : : [ requires cxx98_binders ] ;
run int_div.cpp ;
run sum_avg.cpp ;

View File

@@ -10,27 +10,19 @@
// William Kempf, Jesse Jones and Karl Nelson were all very helpful in the // William Kempf, Jesse Jones and Karl Nelson were all very helpful in the
// design of this library. // design of this library.
#include <boost/preprocessor/iterate.hpp>
#include <boost/detail/workaround.hpp>
#ifndef BOOST_FUNCTION_MAX_ARGS #ifndef BOOST_FUNCTION_MAX_ARGS
# define BOOST_FUNCTION_MAX_ARGS 10 # define BOOST_FUNCTION_MAX_ARGS 10
#endif // BOOST_FUNCTION_MAX_ARGS #endif // BOOST_FUNCTION_MAX_ARGS
#if !defined(BOOST_FUNCTION_MAX_ARGS_DEFINED) || (BOOST_FUNCTION_MAX_ARGS_DEFINED != BOOST_FUNCTION_MAX_ARGS)
#if !defined(BOOST_FUNCTION_MAX_ARGS_DEFINED)
#define BOOST_FUNCTION_MAX_ARGS_DEFINED 0
#endif
#include <functional> // unary_function, binary_function
#include <boost/preprocessor/iterate.hpp>
#include <boost/config/workaround.hpp>
// Include the prologue here so that the use of file-level iteration // Include the prologue here so that the use of file-level iteration
// in anything that may be included by function_template.hpp doesn't break // in anything that may be included by function_template.hpp doesn't break
#include <boost/function/detail/prologue.hpp> #include <boost/function/detail/prologue.hpp>
// Older Visual Age C++ version do not handle the file iteration well // Visual Age C++ doesn't handle the file iteration well
#if BOOST_WORKAROUND(__IBMCPP__, >= 500) && BOOST_WORKAROUND(__IBMCPP__, < 800) #if BOOST_WORKAROUND(__IBMCPP__, <= 600)
# if BOOST_FUNCTION_MAX_ARGS >= 0 # if BOOST_FUNCTION_MAX_ARGS >= 0
# include <boost/function/function0.hpp> # include <boost/function/function0.hpp>
# endif # endif
@@ -70,7 +62,3 @@
# include BOOST_PP_ITERATE() # include BOOST_PP_ITERATE()
# undef BOOST_PP_ITERATION_PARAMS_1 # undef BOOST_PP_ITERATION_PARAMS_1
#endif #endif
#include <boost/function/detail/epilogue.hpp>
#endif // !defined(BOOST_FUNCTION_MAX_ARGS_DEFINED) || (BOOST_FUNCTION_MAX_ARGS_DEFINED != BOOST_FUNCTION_MAX_ARGS)

View File

@@ -1,39 +0,0 @@
// Boost.Function library
#ifndef BOOST_FUNCTION_EPILOGUE_HPP
#define BOOST_FUNCTION_EPILOGUE_HPP
// Copyright 2023 Peter Dimov
// Distributed under the Boost Software License, Version 1.0.
// https://www.boost.org/LICENSE_1_0.txt
// Resolve C++20 issue with fn == bind(...)
// https://github.com/boostorg/function/issues/45
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
namespace boost
{
namespace _bi
{
template<class R, class F, class L> class bind_t;
} // namespace _bi
template<class S, class R, class F, class L> bool operator==( function<S> const& f, _bi::bind_t<R, F, L> const& b )
{
return f.contains( b );
}
template<class S, class R, class F, class L> bool operator!=( function<S> const& f, _bi::bind_t<R, F, L> const& b )
{
return !f.contains( b );
}
} // namespace boost
#endif // #if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
#endif // #ifndef BOOST_FUNCTION_EPILOGUE_HPP

View File

@@ -27,8 +27,6 @@ for($on_arg = 0; $on_arg <= $max_args; ++$on_arg) {
print OUT "#elif"; print OUT "#elif";
} }
print OUT " BOOST_FUNCTION_NUM_ARGS == $on_arg\n"; print OUT " BOOST_FUNCTION_NUM_ARGS == $on_arg\n";
print OUT "# undef BOOST_FUNCTION_MAX_ARGS_DEFINED\n";
print OUT "# define BOOST_FUNCTION_MAX_ARGS_DEFINED $on_arg\n";
print OUT "# ifndef BOOST_FUNCTION_$on_arg\n"; print OUT "# ifndef BOOST_FUNCTION_$on_arg\n";
print OUT "# define BOOST_FUNCTION_$on_arg\n"; print OUT "# define BOOST_FUNCTION_$on_arg\n";
print OUT "# include <boost/function/function_template.hpp>\n"; print OUT "# include <boost/function/function_template.hpp>\n";

View File

@@ -8,358 +8,256 @@
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
#if BOOST_FUNCTION_NUM_ARGS == 0 #if BOOST_FUNCTION_NUM_ARGS == 0
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 0
# ifndef BOOST_FUNCTION_0 # ifndef BOOST_FUNCTION_0
# define BOOST_FUNCTION_0 # define BOOST_FUNCTION_0
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 1 #elif BOOST_FUNCTION_NUM_ARGS == 1
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 1
# ifndef BOOST_FUNCTION_1 # ifndef BOOST_FUNCTION_1
# define BOOST_FUNCTION_1 # define BOOST_FUNCTION_1
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 2 #elif BOOST_FUNCTION_NUM_ARGS == 2
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 2
# ifndef BOOST_FUNCTION_2 # ifndef BOOST_FUNCTION_2
# define BOOST_FUNCTION_2 # define BOOST_FUNCTION_2
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 3 #elif BOOST_FUNCTION_NUM_ARGS == 3
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 3
# ifndef BOOST_FUNCTION_3 # ifndef BOOST_FUNCTION_3
# define BOOST_FUNCTION_3 # define BOOST_FUNCTION_3
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 4 #elif BOOST_FUNCTION_NUM_ARGS == 4
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 4
# ifndef BOOST_FUNCTION_4 # ifndef BOOST_FUNCTION_4
# define BOOST_FUNCTION_4 # define BOOST_FUNCTION_4
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 5 #elif BOOST_FUNCTION_NUM_ARGS == 5
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 5
# ifndef BOOST_FUNCTION_5 # ifndef BOOST_FUNCTION_5
# define BOOST_FUNCTION_5 # define BOOST_FUNCTION_5
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 6 #elif BOOST_FUNCTION_NUM_ARGS == 6
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 6
# ifndef BOOST_FUNCTION_6 # ifndef BOOST_FUNCTION_6
# define BOOST_FUNCTION_6 # define BOOST_FUNCTION_6
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 7 #elif BOOST_FUNCTION_NUM_ARGS == 7
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 7
# ifndef BOOST_FUNCTION_7 # ifndef BOOST_FUNCTION_7
# define BOOST_FUNCTION_7 # define BOOST_FUNCTION_7
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 8 #elif BOOST_FUNCTION_NUM_ARGS == 8
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 8
# ifndef BOOST_FUNCTION_8 # ifndef BOOST_FUNCTION_8
# define BOOST_FUNCTION_8 # define BOOST_FUNCTION_8
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 9 #elif BOOST_FUNCTION_NUM_ARGS == 9
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 9
# ifndef BOOST_FUNCTION_9 # ifndef BOOST_FUNCTION_9
# define BOOST_FUNCTION_9 # define BOOST_FUNCTION_9
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 10 #elif BOOST_FUNCTION_NUM_ARGS == 10
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 10
# ifndef BOOST_FUNCTION_10 # ifndef BOOST_FUNCTION_10
# define BOOST_FUNCTION_10 # define BOOST_FUNCTION_10
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 11 #elif BOOST_FUNCTION_NUM_ARGS == 11
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 11
# ifndef BOOST_FUNCTION_11 # ifndef BOOST_FUNCTION_11
# define BOOST_FUNCTION_11 # define BOOST_FUNCTION_11
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 12 #elif BOOST_FUNCTION_NUM_ARGS == 12
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 12
# ifndef BOOST_FUNCTION_12 # ifndef BOOST_FUNCTION_12
# define BOOST_FUNCTION_12 # define BOOST_FUNCTION_12
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 13 #elif BOOST_FUNCTION_NUM_ARGS == 13
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 13
# ifndef BOOST_FUNCTION_13 # ifndef BOOST_FUNCTION_13
# define BOOST_FUNCTION_13 # define BOOST_FUNCTION_13
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 14 #elif BOOST_FUNCTION_NUM_ARGS == 14
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 14
# ifndef BOOST_FUNCTION_14 # ifndef BOOST_FUNCTION_14
# define BOOST_FUNCTION_14 # define BOOST_FUNCTION_14
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 15 #elif BOOST_FUNCTION_NUM_ARGS == 15
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 15
# ifndef BOOST_FUNCTION_15 # ifndef BOOST_FUNCTION_15
# define BOOST_FUNCTION_15 # define BOOST_FUNCTION_15
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 16 #elif BOOST_FUNCTION_NUM_ARGS == 16
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 16
# ifndef BOOST_FUNCTION_16 # ifndef BOOST_FUNCTION_16
# define BOOST_FUNCTION_16 # define BOOST_FUNCTION_16
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 17 #elif BOOST_FUNCTION_NUM_ARGS == 17
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 17
# ifndef BOOST_FUNCTION_17 # ifndef BOOST_FUNCTION_17
# define BOOST_FUNCTION_17 # define BOOST_FUNCTION_17
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 18 #elif BOOST_FUNCTION_NUM_ARGS == 18
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 18
# ifndef BOOST_FUNCTION_18 # ifndef BOOST_FUNCTION_18
# define BOOST_FUNCTION_18 # define BOOST_FUNCTION_18
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 19 #elif BOOST_FUNCTION_NUM_ARGS == 19
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 19
# ifndef BOOST_FUNCTION_19 # ifndef BOOST_FUNCTION_19
# define BOOST_FUNCTION_19 # define BOOST_FUNCTION_19
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 20 #elif BOOST_FUNCTION_NUM_ARGS == 20
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 20
# ifndef BOOST_FUNCTION_20 # ifndef BOOST_FUNCTION_20
# define BOOST_FUNCTION_20 # define BOOST_FUNCTION_20
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 21 #elif BOOST_FUNCTION_NUM_ARGS == 21
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 21
# ifndef BOOST_FUNCTION_21 # ifndef BOOST_FUNCTION_21
# define BOOST_FUNCTION_21 # define BOOST_FUNCTION_21
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 22 #elif BOOST_FUNCTION_NUM_ARGS == 22
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 22
# ifndef BOOST_FUNCTION_22 # ifndef BOOST_FUNCTION_22
# define BOOST_FUNCTION_22 # define BOOST_FUNCTION_22
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 23 #elif BOOST_FUNCTION_NUM_ARGS == 23
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 23
# ifndef BOOST_FUNCTION_23 # ifndef BOOST_FUNCTION_23
# define BOOST_FUNCTION_23 # define BOOST_FUNCTION_23
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 24 #elif BOOST_FUNCTION_NUM_ARGS == 24
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 24
# ifndef BOOST_FUNCTION_24 # ifndef BOOST_FUNCTION_24
# define BOOST_FUNCTION_24 # define BOOST_FUNCTION_24
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 25 #elif BOOST_FUNCTION_NUM_ARGS == 25
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 25
# ifndef BOOST_FUNCTION_25 # ifndef BOOST_FUNCTION_25
# define BOOST_FUNCTION_25 # define BOOST_FUNCTION_25
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 26 #elif BOOST_FUNCTION_NUM_ARGS == 26
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 26
# ifndef BOOST_FUNCTION_26 # ifndef BOOST_FUNCTION_26
# define BOOST_FUNCTION_26 # define BOOST_FUNCTION_26
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 27 #elif BOOST_FUNCTION_NUM_ARGS == 27
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 27
# ifndef BOOST_FUNCTION_27 # ifndef BOOST_FUNCTION_27
# define BOOST_FUNCTION_27 # define BOOST_FUNCTION_27
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 28 #elif BOOST_FUNCTION_NUM_ARGS == 28
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 28
# ifndef BOOST_FUNCTION_28 # ifndef BOOST_FUNCTION_28
# define BOOST_FUNCTION_28 # define BOOST_FUNCTION_28
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 29 #elif BOOST_FUNCTION_NUM_ARGS == 29
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 29
# ifndef BOOST_FUNCTION_29 # ifndef BOOST_FUNCTION_29
# define BOOST_FUNCTION_29 # define BOOST_FUNCTION_29
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 30 #elif BOOST_FUNCTION_NUM_ARGS == 30
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 30
# ifndef BOOST_FUNCTION_30 # ifndef BOOST_FUNCTION_30
# define BOOST_FUNCTION_30 # define BOOST_FUNCTION_30
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 31 #elif BOOST_FUNCTION_NUM_ARGS == 31
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 31
# ifndef BOOST_FUNCTION_31 # ifndef BOOST_FUNCTION_31
# define BOOST_FUNCTION_31 # define BOOST_FUNCTION_31
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 32 #elif BOOST_FUNCTION_NUM_ARGS == 32
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 32
# ifndef BOOST_FUNCTION_32 # ifndef BOOST_FUNCTION_32
# define BOOST_FUNCTION_32 # define BOOST_FUNCTION_32
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 33 #elif BOOST_FUNCTION_NUM_ARGS == 33
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 33
# ifndef BOOST_FUNCTION_33 # ifndef BOOST_FUNCTION_33
# define BOOST_FUNCTION_33 # define BOOST_FUNCTION_33
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 34 #elif BOOST_FUNCTION_NUM_ARGS == 34
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 34
# ifndef BOOST_FUNCTION_34 # ifndef BOOST_FUNCTION_34
# define BOOST_FUNCTION_34 # define BOOST_FUNCTION_34
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 35 #elif BOOST_FUNCTION_NUM_ARGS == 35
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 35
# ifndef BOOST_FUNCTION_35 # ifndef BOOST_FUNCTION_35
# define BOOST_FUNCTION_35 # define BOOST_FUNCTION_35
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 36 #elif BOOST_FUNCTION_NUM_ARGS == 36
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 36
# ifndef BOOST_FUNCTION_36 # ifndef BOOST_FUNCTION_36
# define BOOST_FUNCTION_36 # define BOOST_FUNCTION_36
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 37 #elif BOOST_FUNCTION_NUM_ARGS == 37
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 37
# ifndef BOOST_FUNCTION_37 # ifndef BOOST_FUNCTION_37
# define BOOST_FUNCTION_37 # define BOOST_FUNCTION_37
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 38 #elif BOOST_FUNCTION_NUM_ARGS == 38
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 38
# ifndef BOOST_FUNCTION_38 # ifndef BOOST_FUNCTION_38
# define BOOST_FUNCTION_38 # define BOOST_FUNCTION_38
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 39 #elif BOOST_FUNCTION_NUM_ARGS == 39
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 39
# ifndef BOOST_FUNCTION_39 # ifndef BOOST_FUNCTION_39
# define BOOST_FUNCTION_39 # define BOOST_FUNCTION_39
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 40 #elif BOOST_FUNCTION_NUM_ARGS == 40
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 40
# ifndef BOOST_FUNCTION_40 # ifndef BOOST_FUNCTION_40
# define BOOST_FUNCTION_40 # define BOOST_FUNCTION_40
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 41 #elif BOOST_FUNCTION_NUM_ARGS == 41
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 41
# ifndef BOOST_FUNCTION_41 # ifndef BOOST_FUNCTION_41
# define BOOST_FUNCTION_41 # define BOOST_FUNCTION_41
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 42 #elif BOOST_FUNCTION_NUM_ARGS == 42
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 42
# ifndef BOOST_FUNCTION_42 # ifndef BOOST_FUNCTION_42
# define BOOST_FUNCTION_42 # define BOOST_FUNCTION_42
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 43 #elif BOOST_FUNCTION_NUM_ARGS == 43
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 43
# ifndef BOOST_FUNCTION_43 # ifndef BOOST_FUNCTION_43
# define BOOST_FUNCTION_43 # define BOOST_FUNCTION_43
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 44 #elif BOOST_FUNCTION_NUM_ARGS == 44
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 44
# ifndef BOOST_FUNCTION_44 # ifndef BOOST_FUNCTION_44
# define BOOST_FUNCTION_44 # define BOOST_FUNCTION_44
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 45 #elif BOOST_FUNCTION_NUM_ARGS == 45
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 45
# ifndef BOOST_FUNCTION_45 # ifndef BOOST_FUNCTION_45
# define BOOST_FUNCTION_45 # define BOOST_FUNCTION_45
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 46 #elif BOOST_FUNCTION_NUM_ARGS == 46
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 46
# ifndef BOOST_FUNCTION_46 # ifndef BOOST_FUNCTION_46
# define BOOST_FUNCTION_46 # define BOOST_FUNCTION_46
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 47 #elif BOOST_FUNCTION_NUM_ARGS == 47
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 47
# ifndef BOOST_FUNCTION_47 # ifndef BOOST_FUNCTION_47
# define BOOST_FUNCTION_47 # define BOOST_FUNCTION_47
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 48 #elif BOOST_FUNCTION_NUM_ARGS == 48
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 48
# ifndef BOOST_FUNCTION_48 # ifndef BOOST_FUNCTION_48
# define BOOST_FUNCTION_48 # define BOOST_FUNCTION_48
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 49 #elif BOOST_FUNCTION_NUM_ARGS == 49
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 49
# ifndef BOOST_FUNCTION_49 # ifndef BOOST_FUNCTION_49
# define BOOST_FUNCTION_49 # define BOOST_FUNCTION_49
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>
# endif # endif
#elif BOOST_FUNCTION_NUM_ARGS == 50 #elif BOOST_FUNCTION_NUM_ARGS == 50
# undef BOOST_FUNCTION_MAX_ARGS_DEFINED
# define BOOST_FUNCTION_MAX_ARGS_DEFINED 50
# ifndef BOOST_FUNCTION_50 # ifndef BOOST_FUNCTION_50
# define BOOST_FUNCTION_50 # define BOOST_FUNCTION_50
# include <boost/function/function_template.hpp> # include <boost/function/function_template.hpp>

View File

@@ -11,7 +11,6 @@
#define BOOST_FUNCTION_PROLOGUE_HPP #define BOOST_FUNCTION_PROLOGUE_HPP
# include <cassert> # include <cassert>
# include <algorithm> # include <algorithm>
# include <boost/config/no_tr1/functional.hpp> // unary_function, binary_function
# include <boost/throw_exception.hpp> # include <boost/throw_exception.hpp>
# include <boost/config.hpp> # include <boost/config.hpp>
# include <boost/function/function_base.hpp> # include <boost/function/function_base.hpp>
@@ -22,5 +21,4 @@
# include <boost/preprocessor/cat.hpp> # include <boost/preprocessor/cat.hpp>
# include <boost/preprocessor/repeat.hpp> # include <boost/preprocessor/repeat.hpp>
# include <boost/preprocessor/inc.hpp> # include <boost/preprocessor/inc.hpp>
# include <boost/type_traits/is_void.hpp>
#endif // BOOST_FUNCTION_PROLOGUE_HPP #endif // BOOST_FUNCTION_PROLOGUE_HPP

View File

@@ -1,9 +1,8 @@
// Boost.Function library // Boost.Function library
// Copyright Douglas Gregor 2001-2006 // Copyright Douglas Gregor 2001-2004. Use, modification and
// Copyright Emil Dotchevski 2007 // distribution is subject to the Boost Software License, Version
// Use, modification and distribution is subject to the Boost Software License, Version 1.0. // 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
@@ -15,108 +14,124 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include <new> #include <new>
#include <typeinfo>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/type_index.hpp>
#include <boost/type_traits/has_trivial_copy.hpp>
#include <boost/type_traits/has_trivial_destructor.hpp>
#include <boost/type_traits/is_const.hpp>
#include <boost/type_traits/is_integral.hpp> #include <boost/type_traits/is_integral.hpp>
#include <boost/type_traits/is_volatile.hpp>
#include <boost/type_traits/composite_traits.hpp> #include <boost/type_traits/composite_traits.hpp>
#include <boost/type_traits/is_stateless.hpp>
#include <boost/ref.hpp> #include <boost/ref.hpp>
#include <boost/type_traits/conditional.hpp> #include <boost/pending/ct_if.hpp>
#include <boost/config/workaround.hpp> #include <boost/detail/workaround.hpp>
#include <boost/type_traits/alignment_of.hpp>
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
#include <boost/type_traits/enable_if.hpp> # include "boost/utility/enable_if.hpp"
#else #else
#include <boost/type_traits/integral_constant.hpp> # include "boost/mpl/bool.hpp"
#endif #endif
#include <boost/function_equal.hpp> #include <boost/function_equal.hpp>
#include <boost/function/function_fwd.hpp>
#if defined(BOOST_MSVC) // Borrowed from Boost.Python library: determines the cases where we
# pragma warning( push ) // need to use std::type_info::name to compare instead of operator==.
# pragma warning( disable : 4793 ) // complaint about native code generation # if (defined(__GNUC__) && __GNUC__ >= 3) \
# pragma warning( disable : 4127 ) // "conditional expression is constant" || defined(_AIX) \
|| ( defined(__sgi) && defined(__host_mips))
# include <cstring>
# define BOOST_FUNCTION_COMPARE_TYPE_ID(X,Y) \
(std::strcmp((X).name(),(Y).name()) == 0)
# else
# define BOOST_FUNCTION_COMPARE_TYPE_ID(X,Y) ((X)==(Y))
#endif #endif
#if defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406 && !defined(BOOST_STRICT_CONFIG) #if defined(BOOST_MSVC) && BOOST_MSVC <= 1300 || defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406 && !defined(BOOST_STRICT_CONFIG)
# define BOOST_FUNCTION_TARGET_FIX(x) x # define BOOST_FUNCTION_TARGET_FIX(x) x
#else #else
# define BOOST_FUNCTION_TARGET_FIX(x) # define BOOST_FUNCTION_TARGET_FIX(x)
#endif // __ICL etc #endif // not MSVC
#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG)
// Work around a compiler bug.
// boost::python::objects::function has to be seen by the compiler before the
// boost::function class template.
namespace boost { namespace python { namespace objects {
class function;
}}}
#endif
#if defined (BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
|| defined(BOOST_BCB_PARTIAL_SPECIALIZATION_BUG) \
|| !(BOOST_STRICT_CONFIG || !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540)
# define BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX
#endif
#define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \ #define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \
typename ::boost::enable_if_< \ typename ::boost::enable_if_c<(::boost::type_traits::ice_not< \
!(::boost::is_integral<Functor>::value), \ (::boost::is_integral<Functor>::value)>::value), \
Type>::type Type>::type
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
namespace boost {
#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG)
// The library shipping with MIPSpro 7.3.1.3m has a broken allocator<void>
class function_base;
template<typename Signature,
typename Allocator = std::allocator<function_base> >
class function;
#else
template<typename Signature, typename Allocator = std::allocator<void> >
class function;
#endif
template<typename Signature, typename Allocator>
inline void swap(function<Signature, Allocator>& f1,
function<Signature, Allocator>& f2)
{
f1.swap(f2);
}
} // end namespace boost
#endif // have partial specialization
namespace boost { namespace boost {
namespace detail { namespace detail {
namespace function { namespace function {
class X;
/** /**
* A buffer used to store small function objects in * A union of a function pointer and a void pointer. This is necessary
* boost::function. It is a union containing function pointers, * because 5.2.10/6 allows reinterpret_cast<> to safely cast between
* object pointers, and a structure that resembles a bound * function pointer types and 5.2.9/10 allows static_cast<> to safely
* member function pointer. * cast between a void pointer and an object pointer. But it is not legal
*/ * to cast between a function pointer and a void* (in either direction),
union function_buffer_members * so function requires a union of the two. */
union any_pointer
{ {
// For pointers to function objects
typedef void* obj_ptr_t;
mutable obj_ptr_t obj_ptr;
// For pointers to std::type_info objects
struct type_t {
// (get_functor_type_tag, check_functor_type_tag).
const boost::typeindex::type_info* type;
// Whether the type is const-qualified.
bool const_qualified;
// Whether the type is volatile-qualified.
bool volatile_qualified;
} type;
// For function pointers of all kinds
typedef void (*func_ptr_t)();
mutable func_ptr_t func_ptr;
#if defined(BOOST_MSVC) && BOOST_MSVC >= 1929
# pragma warning(push)
# pragma warning(disable: 5243)
#endif
// For bound member pointers
struct bound_memfunc_ptr_t {
void (X::*memfunc_ptr)(int);
void* obj_ptr; void* obj_ptr;
} bound_memfunc_ptr; const void* const_obj_ptr;
void (*func_ptr)();
#if defined(BOOST_MSVC) && BOOST_MSVC >= 1929 char data[1];
# pragma warning(pop)
#endif
// For references to function objects. We explicitly keep
// track of the cv-qualifiers on the object referenced.
struct obj_ref_t {
mutable void* obj_ptr;
bool is_const_qualified;
bool is_volatile_qualified;
} obj_ref;
}; };
union BOOST_SYMBOL_VISIBLE function_buffer inline any_pointer make_any_pointer(void* o)
{ {
// Type-specific union members any_pointer p;
mutable function_buffer_members members; p.obj_ptr = o;
return p;
}
// To relax aliasing constraints inline any_pointer make_any_pointer(const void* o)
mutable char data[sizeof(function_buffer_members)]; {
}; any_pointer p;
p.const_obj_ptr = o;
return p;
}
inline any_pointer make_any_pointer(void (*f)())
{
any_pointer p;
p.func_ptr = f;
return p;
}
/** /**
* The unusable class is a placeholder for unused function arguments * The unusable class is a placeholder for unused function arguments
@@ -145,10 +160,8 @@ namespace boost {
// The operation type to perform on the given functor/function pointer // The operation type to perform on the given functor/function pointer
enum functor_manager_operation_type { enum functor_manager_operation_type {
clone_functor_tag, clone_functor_tag,
move_functor_tag,
destroy_functor_tag, destroy_functor_tag,
check_functor_type_tag, check_functor_type_tag
get_functor_type_tag
}; };
// Tags used to decide between different types of functions // Tags used to decide between different types of functions
@@ -156,100 +169,54 @@ namespace boost {
struct function_obj_tag {}; struct function_obj_tag {};
struct member_ptr_tag {}; struct member_ptr_tag {};
struct function_obj_ref_tag {}; struct function_obj_ref_tag {};
struct stateless_function_obj_tag {};
template<typename F> template<typename F>
class get_function_tag class get_function_tag
{ {
typedef typename conditional<(is_pointer<F>::value), typedef typename ct_if<(is_pointer<F>::value),
function_ptr_tag, function_ptr_tag,
function_obj_tag>::type ptr_or_obj_tag; function_obj_tag>::type ptr_or_obj_tag;
typedef typename conditional<(is_member_pointer<F>::value), typedef typename ct_if<(is_member_pointer<F>::value),
member_ptr_tag, member_ptr_tag,
ptr_or_obj_tag>::type ptr_or_obj_or_mem_tag; ptr_or_obj_tag>::type ptr_or_obj_or_mem_tag;
typedef typename conditional<(is_reference_wrapper<F>::value), typedef typename ct_if<(is_reference_wrapper<F>::value),
function_obj_ref_tag, function_obj_ref_tag,
ptr_or_obj_or_mem_tag>::type or_ref_tag; ptr_or_obj_or_mem_tag>::type or_ref_tag;
public: public:
typedef or_ref_tag type; typedef typename ct_if<(is_stateless<F>::value),
stateless_function_obj_tag,
or_ref_tag>::type type;
}; };
// The trivial manager does nothing but return the same pointer (if we // The trivial manager does nothing but return the same pointer (if we
// are cloning) or return the null pointer (if we are deleting). // are cloning) or return the null pointer (if we are deleting).
template<typename F> template<typename F>
struct reference_manager struct trivial_manager
{ {
static inline void static inline any_pointer
manage(const function_buffer& in_buffer, function_buffer& out_buffer, get(any_pointer f, functor_manager_operation_type op)
functor_manager_operation_type op)
{ {
switch (op) { switch (op) {
case clone_functor_tag: case clone_functor_tag: return f;
out_buffer.members.obj_ref = in_buffer.members.obj_ref;
return;
case move_functor_tag:
out_buffer.members.obj_ref = in_buffer.members.obj_ref;
in_buffer.members.obj_ref.obj_ptr = 0;
return;
case destroy_functor_tag: case destroy_functor_tag:
out_buffer.members.obj_ref.obj_ptr = 0; return make_any_pointer(reinterpret_cast<void*>(0));
return;
case check_functor_type_tag: case check_functor_type_tag:
{ {
// Check whether we have the same type. We can add std::type_info* t = static_cast<std::type_info*>(f.obj_ptr);
// cv-qualifiers, but we can't take them away. return BOOST_FUNCTION_COMPARE_TYPE_ID(typeid(F), *t)?
if (*out_buffer.members.type.type == boost::typeindex::type_id<F>() f
&& (!in_buffer.members.obj_ref.is_const_qualified : make_any_pointer(reinterpret_cast<void*>(0));
|| out_buffer.members.type.const_qualified)
&& (!in_buffer.members.obj_ref.is_volatile_qualified
|| out_buffer.members.type.volatile_qualified))
out_buffer.members.obj_ptr = in_buffer.members.obj_ref.obj_ptr;
else
out_buffer.members.obj_ptr = 0;
}
return;
case get_functor_type_tag:
out_buffer.members.type.type = &boost::typeindex::type_id<F>().type_info();
out_buffer.members.type.const_qualified = in_buffer.members.obj_ref.is_const_qualified;
out_buffer.members.type.volatile_qualified = in_buffer.members.obj_ref.is_volatile_qualified;
return;
} }
} }
};
/** // Clears up a warning with GCC 3.2.3
* Determine if boost::function can use the small-object return make_any_pointer(reinterpret_cast<void*>(0));
* optimization with the function object type F.
*/
template<typename F>
struct function_allows_small_object_optimization
{
BOOST_STATIC_CONSTANT
(bool,
value = ((sizeof(F) <= sizeof(function_buffer) &&
(alignment_of<function_buffer>::value
% alignment_of<F>::value == 0))));
};
template <typename F,typename A>
struct functor_wrapper: public F, public A
{
functor_wrapper( F f, A a ):
F(f),
A(a)
{
}
functor_wrapper(const functor_wrapper& f) :
F(static_cast<const F&>(f)),
A(static_cast<const A&>(f))
{
} }
}; };
@@ -257,269 +224,95 @@ namespace boost {
* The functor_manager class contains a static function "manage" which * The functor_manager class contains a static function "manage" which
* can clone or destroy the given function/function object pointer. * can clone or destroy the given function/function object pointer.
*/ */
template<typename Functor> template<typename Functor, typename Allocator>
struct functor_manager_common
{
typedef Functor functor_type;
// Function pointers
static inline void
manage_ptr(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op)
{
if (op == clone_functor_tag)
out_buffer.members.func_ptr = in_buffer.members.func_ptr;
else if (op == move_functor_tag) {
out_buffer.members.func_ptr = in_buffer.members.func_ptr;
in_buffer.members.func_ptr = 0;
} else if (op == destroy_functor_tag)
out_buffer.members.func_ptr = 0;
else if (op == check_functor_type_tag) {
if (*out_buffer.members.type.type == boost::typeindex::type_id<Functor>())
out_buffer.members.obj_ptr = &in_buffer.members.func_ptr;
else
out_buffer.members.obj_ptr = 0;
} else /* op == get_functor_type_tag */ {
out_buffer.members.type.type = &boost::typeindex::type_id<Functor>().type_info();
out_buffer.members.type.const_qualified = false;
out_buffer.members.type.volatile_qualified = false;
}
}
// Function objects that fit in the small-object buffer.
static inline void
manage_small(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op)
{
if (op == clone_functor_tag || op == move_functor_tag) {
const functor_type* in_functor =
reinterpret_cast<const functor_type*>(in_buffer.data);
new (reinterpret_cast<void*>(out_buffer.data)) functor_type(*in_functor);
if (op == move_functor_tag) {
functor_type* f = reinterpret_cast<functor_type*>(in_buffer.data);
(void)f; // suppress warning about the value of f not being used (MSVC)
f->~Functor();
}
} else if (op == destroy_functor_tag) {
// Some compilers (Borland, vc6, ...) are unhappy with ~functor_type.
functor_type* f = reinterpret_cast<functor_type*>(out_buffer.data);
(void)f; // suppress warning about the value of f not being used (MSVC)
f->~Functor();
} else if (op == check_functor_type_tag) {
if (*out_buffer.members.type.type == boost::typeindex::type_id<Functor>())
out_buffer.members.obj_ptr = in_buffer.data;
else
out_buffer.members.obj_ptr = 0;
} else /* op == get_functor_type_tag */ {
out_buffer.members.type.type = &boost::typeindex::type_id<Functor>().type_info();
out_buffer.members.type.const_qualified = false;
out_buffer.members.type.volatile_qualified = false;
}
}
};
template<typename Functor>
struct functor_manager struct functor_manager
{ {
private: private:
typedef Functor functor_type; typedef Functor functor_type;
// Function pointers // For function pointers, the manager is trivial
static inline void static inline any_pointer
manager(const function_buffer& in_buffer, function_buffer& out_buffer, manager(any_pointer function_ptr,
functor_manager_operation_type op, function_ptr_tag) functor_manager_operation_type op,
function_ptr_tag)
{ {
functor_manager_common<Functor>::manage_ptr(in_buffer,out_buffer,op); if (op == clone_functor_tag)
} return function_ptr;
// Function objects that fit in the small-object buffer.
static inline void
manager(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op, true_type)
{
functor_manager_common<Functor>::manage_small(in_buffer,out_buffer,op);
}
// Function objects that require heap allocation
static inline void
manager(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op, false_type)
{
if (op == clone_functor_tag) {
// Clone the functor
// GCC 2.95.3 gets the CV qualifiers wrong here, so we
// can't do the static_cast that we should do.
// jewillco: Changing this to static_cast because GCC 2.95.3 is
// obsolete.
const functor_type* f =
static_cast<const functor_type*>(in_buffer.members.obj_ptr);
functor_type* new_f = new functor_type(*f);
out_buffer.members.obj_ptr = new_f;
} else if (op == move_functor_tag) {
out_buffer.members.obj_ptr = in_buffer.members.obj_ptr;
in_buffer.members.obj_ptr = 0;
} else if (op == destroy_functor_tag) {
/* Cast from the void pointer to the functor pointer type */
functor_type* f =
static_cast<functor_type*>(out_buffer.members.obj_ptr);
delete f;
out_buffer.members.obj_ptr = 0;
} else if (op == check_functor_type_tag) {
if (*out_buffer.members.type.type == boost::typeindex::type_id<Functor>())
out_buffer.members.obj_ptr = in_buffer.members.obj_ptr;
else else
out_buffer.members.obj_ptr = 0; return make_any_pointer(static_cast<void (*)()>(0));
} else /* op == get_functor_type_tag */ {
out_buffer.members.type.type = &boost::typeindex::type_id<Functor>().type_info();
out_buffer.members.type.const_qualified = false;
out_buffer.members.type.volatile_qualified = false;
}
} }
// For function objects, we determine whether the function // For function object pointers, we clone the pointer to each
// object can use the small-object optimization buffer or // function has its own version.
// whether we need to allocate it on the heap. static inline any_pointer
static inline void manager(any_pointer function_obj_ptr,
manager(const function_buffer& in_buffer, function_buffer& out_buffer, functor_manager_operation_type op,
functor_manager_operation_type op, function_obj_tag) function_obj_tag)
{ {
manager(in_buffer, out_buffer, op, #ifndef BOOST_NO_STD_ALLOCATOR
integral_constant<bool, (function_allows_small_object_optimization<functor_type>::value)>()); typedef typename Allocator::template rebind<functor_type>::other
} allocator_type;
typedef typename allocator_type::pointer pointer_type;
// For member pointers, we use the small-object optimization buffer.
static inline void
manager(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op, member_ptr_tag)
{
manager(in_buffer, out_buffer, op, true_type());
}
public:
/* Dispatch to an appropriate manager based on whether we have a
function pointer or a function object pointer. */
static inline void
manage(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op)
{
typedef typename get_function_tag<functor_type>::type tag_type;
if (op == get_functor_type_tag) {
out_buffer.members.type.type = &boost::typeindex::type_id<functor_type>().type_info();
out_buffer.members.type.const_qualified = false;
out_buffer.members.type.volatile_qualified = false;
} else {
manager(in_buffer, out_buffer, op, tag_type());
}
}
};
template<typename Functor, typename Allocator>
struct functor_manager_a
{
private:
typedef Functor functor_type;
// Function pointers
static inline void
manager(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op, function_ptr_tag)
{
functor_manager_common<Functor>::manage_ptr(in_buffer,out_buffer,op);
}
// Function objects that fit in the small-object buffer.
static inline void
manager(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op, true_type)
{
functor_manager_common<Functor>::manage_small(in_buffer,out_buffer,op);
}
// Function objects that require heap allocation
static inline void
manager(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op, false_type)
{
typedef functor_wrapper<Functor,Allocator> functor_wrapper_type;
#if defined(BOOST_NO_CXX11_ALLOCATOR)
typedef typename Allocator::template rebind<functor_wrapper_type>::other
wrapper_allocator_type;
typedef typename wrapper_allocator_type::pointer wrapper_allocator_pointer_type;
#else #else
using wrapper_allocator_type = typename std::allocator_traits<Allocator>::template rebind_alloc<functor_wrapper_type>; typedef functor_type* pointer_type;
using wrapper_allocator_pointer_type = typename std::allocator_traits<wrapper_allocator_type>::pointer; #endif // BOOST_NO_STD_ALLOCATOR
#endif
# ifndef BOOST_NO_STD_ALLOCATOR
allocator_type allocator;
# endif // BOOST_NO_STD_ALLOCATOR
if (op == clone_functor_tag) { if (op == clone_functor_tag) {
functor_type* f =
static_cast<functor_type*>(function_obj_ptr.obj_ptr);
// Clone the functor // Clone the functor
// GCC 2.95.3 gets the CV qualifiers wrong here, so we # ifndef BOOST_NO_STD_ALLOCATOR
// can't do the static_cast that we should do. pointer_type copy = allocator.allocate(1);
const functor_wrapper_type* f = allocator.construct(copy, *f);
static_cast<const functor_wrapper_type*>(in_buffer.members.obj_ptr);
wrapper_allocator_type wrapper_allocator(static_cast<Allocator const &>(*f));
wrapper_allocator_pointer_type copy = wrapper_allocator.allocate(1);
#if defined(BOOST_NO_CXX11_ALLOCATOR)
wrapper_allocator.construct(copy, *f);
#else
std::allocator_traits<wrapper_allocator_type>::construct(wrapper_allocator, copy, *f);
#endif
// Get back to the original pointer type // Get back to the original pointer type
functor_wrapper_type* new_f = static_cast<functor_wrapper_type*>(copy); functor_type* new_f = static_cast<functor_type*>(copy);
out_buffer.members.obj_ptr = new_f;
} else if (op == move_functor_tag) {
out_buffer.members.obj_ptr = in_buffer.members.obj_ptr;
in_buffer.members.obj_ptr = 0;
} else if (op == destroy_functor_tag) {
/* Cast from the void pointer to the functor_wrapper_type */
functor_wrapper_type* victim =
static_cast<functor_wrapper_type*>(in_buffer.members.obj_ptr);
wrapper_allocator_type wrapper_allocator(static_cast<Allocator const &>(*victim));
#if defined(BOOST_NO_CXX11_ALLOCATOR)
wrapper_allocator.destroy(victim);
# else # else
std::allocator_traits<wrapper_allocator_type>::destroy(wrapper_allocator, victim); functor_type* new_f = new functor_type(*f);
#endif # endif // BOOST_NO_STD_ALLOCATOR
wrapper_allocator.deallocate(victim,1); return make_any_pointer(static_cast<void*>(new_f));
out_buffer.members.obj_ptr = 0;
} else if (op == check_functor_type_tag) {
if (*out_buffer.members.type.type == boost::typeindex::type_id<Functor>())
out_buffer.members.obj_ptr = in_buffer.members.obj_ptr;
else
out_buffer.members.obj_ptr = 0;
} else /* op == get_functor_type_tag */ {
out_buffer.members.type.type = &boost::typeindex::type_id<Functor>().type_info();
out_buffer.members.type.const_qualified = false;
out_buffer.members.type.volatile_qualified = false;
}
} }
else {
/* Cast from the void pointer to the functor pointer type */
functor_type* f =
reinterpret_cast<functor_type*>(function_obj_ptr.obj_ptr);
// For function objects, we determine whether the function # ifndef BOOST_NO_STD_ALLOCATOR
// object can use the small-object optimization buffer or /* Cast from the functor pointer type to the allocator's pointer
// whether we need to allocate it on the heap. type */
static inline void pointer_type victim = static_cast<pointer_type>(f);
manager(const function_buffer& in_buffer, function_buffer& out_buffer,
functor_manager_operation_type op, function_obj_tag)
{
manager(in_buffer, out_buffer, op,
integral_constant<bool, (function_allows_small_object_optimization<functor_type>::value)>());
}
// Destroy and deallocate the functor
allocator.destroy(victim);
allocator.deallocate(victim, 1);
# else
delete f;
# endif // BOOST_NO_STD_ALLOCATOR
return make_any_pointer(static_cast<void*>(0));
}
}
public: public:
/* Dispatch to an appropriate manager based on whether we have a /* Dispatch to an appropriate manager based on whether we have a
function pointer or a function object pointer. */ function pointer or a function object pointer. */
static inline void static any_pointer
manage(const function_buffer& in_buffer, function_buffer& out_buffer, manage(any_pointer functor_ptr, functor_manager_operation_type op)
functor_manager_operation_type op)
{ {
if (op == check_functor_type_tag) {
std::type_info* type =
static_cast<std::type_info*>(functor_ptr.obj_ptr);
return (BOOST_FUNCTION_COMPARE_TYPE_ID(typeid(Functor), *type)?
functor_ptr
: make_any_pointer(reinterpret_cast<void*>(0)));
}
else {
typedef typename get_function_tag<functor_type>::type tag_type; typedef typename get_function_tag<functor_type>::type tag_type;
if (op == get_functor_type_tag) { return manager(functor_ptr, op, tag_type());
out_buffer.members.type.type = &boost::typeindex::type_id<functor_type>().type_info();
out_buffer.members.type.const_qualified = false;
out_buffer.members.type.volatile_qualified = false;
} else {
manager(in_buffer, out_buffer, op, tag_type());
} }
} }
}; };
@@ -530,24 +323,24 @@ namespace boost {
#ifdef BOOST_NO_SFINAE #ifdef BOOST_NO_SFINAE
// These routines perform comparisons between a Boost.Function // These routines perform comparisons between a Boost.Function
// object and an arbitrary function object (when the last // object and an arbitrary function object (when the last
// parameter is false_type) or against zero (when the // parameter is mpl::bool_<false>) or against zero (when the
// last parameter is true_type). They are only necessary // last parameter is mpl::bool_<true>). They are only necessary
// for compilers that don't support SFINAE. // for compilers that don't support SFINAE.
template<typename Function, typename Functor> template<typename Function, typename Functor>
bool bool
compare_equal(const Function& f, const Functor&, int, true_type) compare_equal(const Function& f, const Functor&, int, mpl::bool_<true>)
{ return f.empty(); } { return f.empty(); }
template<typename Function, typename Functor> template<typename Function, typename Functor>
bool bool
compare_not_equal(const Function& f, const Functor&, int, compare_not_equal(const Function& f, const Functor&, int,
true_type) mpl::bool_<true>)
{ return !f.empty(); } { return !f.empty(); }
template<typename Function, typename Functor> template<typename Function, typename Functor>
bool bool
compare_equal(const Function& f, const Functor& g, long, compare_equal(const Function& f, const Functor& g, long,
false_type) mpl::bool_<false>)
{ {
if (const Functor* fp = f.template target<Functor>()) if (const Functor* fp = f.template target<Functor>())
return function_equal(*fp, g); return function_equal(*fp, g);
@@ -557,7 +350,7 @@ namespace boost {
template<typename Function, typename Functor> template<typename Function, typename Functor>
bool bool
compare_equal(const Function& f, const reference_wrapper<Functor>& g, compare_equal(const Function& f, const reference_wrapper<Functor>& g,
int, false_type) int, mpl::bool_<false>)
{ {
if (const Functor* fp = f.template target<Functor>()) if (const Functor* fp = f.template target<Functor>())
return fp == g.get_pointer(); return fp == g.get_pointer();
@@ -567,7 +360,7 @@ namespace boost {
template<typename Function, typename Functor> template<typename Function, typename Functor>
bool bool
compare_not_equal(const Function& f, const Functor& g, long, compare_not_equal(const Function& f, const Functor& g, long,
false_type) mpl::bool_<false>)
{ {
if (const Functor* fp = f.template target<Functor>()) if (const Functor* fp = f.template target<Functor>())
return !function_equal(*fp, g); return !function_equal(*fp, g);
@@ -578,24 +371,13 @@ namespace boost {
bool bool
compare_not_equal(const Function& f, compare_not_equal(const Function& f,
const reference_wrapper<Functor>& g, int, const reference_wrapper<Functor>& g, int,
false_type) mpl::bool_<false>)
{ {
if (const Functor* fp = f.template target<Functor>()) if (const Functor* fp = f.template target<Functor>())
return fp != g.get_pointer(); return fp != g.get_pointer();
else return true; else return true;
} }
#endif // BOOST_NO_SFINAE #endif // BOOST_NO_SFINAE
/**
* Stores the "manager" portion of the vtable for a
* boost::function object.
*/
struct vtable_base
{
void (*manager)(const function_buffer& in_buffer,
function_buffer& out_buffer,
functor_manager_operation_type op);
};
} // end namespace function } // end namespace function
} // end namespace detail } // end namespace detail
@@ -608,57 +390,48 @@ namespace boost {
class function_base class function_base
{ {
public: public:
function_base() : vtable(0) { } function_base() : manager(0)
/** Determine if the function is empty (i.e., has no target). */
bool empty() const { return !vtable; }
/** Retrieve the type of the stored function object, or type_id<void>()
if this is empty. */
const boost::typeindex::type_info& target_type() const
{ {
if (!vtable) return boost::typeindex::type_id<void>().type_info(); functor.obj_ptr = 0;
detail::function::function_buffer type;
get_vtable()->manager(functor, type, detail::function::get_functor_type_tag);
return *type.members.type.type;
} }
// Is this function empty?
bool empty() const { return !manager; }
template<typename Functor> template<typename Functor>
Functor* target() Functor* target()
{ {
if (!vtable) return 0; if (!manager) return 0;
detail::function::function_buffer type_result; detail::function::any_pointer result =
type_result.members.type.type = &boost::typeindex::type_id<Functor>().type_info(); manager(detail::function::make_any_pointer(&typeid(Functor)),
type_result.members.type.const_qualified = is_const<Functor>::value;
type_result.members.type.volatile_qualified = is_volatile<Functor>::value;
get_vtable()->manager(functor, type_result,
detail::function::check_functor_type_tag); detail::function::check_functor_type_tag);
return static_cast<Functor*>(type_result.members.obj_ptr); if (!result.obj_ptr) return 0;
else {
typedef typename detail::function::get_function_tag<Functor>::type tag;
return get_functor_pointer<Functor>(tag(), 0);
}
} }
template<typename Functor> template<typename Functor>
const Functor* target() const const Functor* target() const
{ {
if (!vtable) return 0; if (!manager) return 0;
detail::function::function_buffer type_result; detail::function::any_pointer result =
type_result.members.type.type = &boost::typeindex::type_id<Functor>().type_info(); manager(detail::function::make_any_pointer(&typeid(Functor)),
type_result.members.type.const_qualified = true;
type_result.members.type.volatile_qualified = is_volatile<Functor>::value;
get_vtable()->manager(functor, type_result,
detail::function::check_functor_type_tag); detail::function::check_functor_type_tag);
// GCC 2.95.3 gets the CV qualifiers wrong here, so we if (!result.obj_ptr) return 0;
// can't do the static_cast that we should do. else {
return static_cast<const Functor*>(type_result.members.obj_ptr); typedef typename detail::function::get_function_tag<Functor>::type tag;
return get_functor_pointer<Functor>(tag(), 0);
}
} }
template<typename F> template<typename F>
bool contains(const F& f) const bool contains(const F& f) const
{ {
if (const F* fp = this->template target<F>()) if (const F* fp = this->template target<F>()) {
{
return function_equal(*fp, f); return function_equal(*fp, f);
} else { } else {
return false; return false;
@@ -689,35 +462,39 @@ public:
#endif #endif
public: // should be protected, but GCC 2.95.3 will fail to allow access public: // should be protected, but GCC 2.95.3 will fail to allow access
detail::function::vtable_base* get_vtable() const { detail::function::any_pointer (*manager)(
return reinterpret_cast<detail::function::vtable_base*>( detail::function::any_pointer,
reinterpret_cast<std::size_t>(vtable) & ~static_cast<std::size_t>(0x01)); detail::function::functor_manager_operation_type);
} detail::function::any_pointer functor;
bool has_trivial_copy_and_destroy() const { private:
return reinterpret_cast<std::size_t>(vtable) & 0x01; template<typename Functor>
} Functor* get_functor_pointer(detail::function::function_ptr_tag, int)
{ return reinterpret_cast<Functor*>(&functor.func_ptr); }
detail::function::vtable_base* vtable; template<typename Functor, typename Tag>
mutable detail::function::function_buffer functor; Functor* get_functor_pointer(Tag, long)
{ return static_cast<Functor*>(functor.obj_ptr); }
template<typename Functor>
const Functor*
get_functor_pointer(detail::function::function_ptr_tag, int) const
{ return reinterpret_cast<const Functor*>(&functor.func_ptr); }
template<typename Functor, typename Tag>
const Functor* get_functor_pointer(Tag, long) const
{ return static_cast<const Functor*>(functor.const_obj_ptr); }
}; };
#if defined(BOOST_CLANG)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wweak-vtables"
#endif
/** /**
* The bad_function_call exception class is thrown when a boost::function * The bad_function_call exception class is thrown when a boost::function
* object is invoked * object is invoked
*/ */
class BOOST_SYMBOL_VISIBLE bad_function_call : public std::runtime_error class bad_function_call : public std::runtime_error
{ {
public: public:
bad_function_call() : std::runtime_error("call to empty boost::function") {} bad_function_call() : std::runtime_error("call to empty boost::function") {}
}; };
#if defined(BOOST_CLANG)
# pragma clang diagnostic pop
#endif
#ifndef BOOST_NO_SFINAE #ifndef BOOST_NO_SFINAE
inline bool operator==(const function_base& f, inline bool operator==(const function_base& f,
@@ -750,28 +527,28 @@ inline bool operator!=(detail::function::useless_clear_type*,
template<typename Functor> template<typename Functor>
inline bool operator==(const function_base& f, Functor g) inline bool operator==(const function_base& f, Functor g)
{ {
typedef integral_constant<bool, (is_integral<Functor>::value)> integral; typedef mpl::bool_<(is_integral<Functor>::value)> integral;
return detail::function::compare_equal(f, g, 0, integral()); return detail::function::compare_equal(f, g, 0, integral());
} }
template<typename Functor> template<typename Functor>
inline bool operator==(Functor g, const function_base& f) inline bool operator==(Functor g, const function_base& f)
{ {
typedef integral_constant<bool, (is_integral<Functor>::value)> integral; typedef mpl::bool_<(is_integral<Functor>::value)> integral;
return detail::function::compare_equal(f, g, 0, integral()); return detail::function::compare_equal(f, g, 0, integral());
} }
template<typename Functor> template<typename Functor>
inline bool operator!=(const function_base& f, Functor g) inline bool operator!=(const function_base& f, Functor g)
{ {
typedef integral_constant<bool, (is_integral<Functor>::value)> integral; typedef mpl::bool_<(is_integral<Functor>::value)> integral;
return detail::function::compare_not_equal(f, g, 0, integral()); return detail::function::compare_not_equal(f, g, 0, integral());
} }
template<typename Functor> template<typename Functor>
inline bool operator!=(Functor g, const function_base& f) inline bool operator!=(Functor g, const function_base& f)
{ {
typedef integral_constant<bool, (is_integral<Functor>::value)> integral; typedef mpl::bool_<(is_integral<Functor>::value)> integral;
return detail::function::compare_not_equal(f, g, 0, integral()); return detail::function::compare_not_equal(f, g, 0, integral());
} }
#else #else
@@ -878,9 +655,6 @@ namespace detail {
} // end namespace boost } // end namespace boost
#undef BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL #undef BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL
#undef BOOST_FUNCTION_COMPARE_TYPE_ID
#if defined(BOOST_MSVC)
# pragma warning( pop )
#endif
#endif // BOOST_FUNCTION_BASE_HEADER #endif // BOOST_FUNCTION_BASE_HEADER

View File

@@ -1,69 +0,0 @@
// Boost.Function library
// Copyright (C) Douglas Gregor 2008
//
// Use, modification and distribution is 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)
//
// For more information, see http://www.boost.org
#ifndef BOOST_FUNCTION_FWD_HPP
#define BOOST_FUNCTION_FWD_HPP
#include <boost/config.hpp>
#if defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730 && !defined(BOOST_STRICT_CONFIG)
// Work around a compiler bug.
// boost::python::objects::function has to be seen by the compiler before the
// boost::function class template.
namespace boost { namespace python { namespace objects {
class function;
}}}
#endif
#if defined(BOOST_BCB_PARTIAL_SPECIALIZATION_BUG) \
|| !(defined(BOOST_STRICT_CONFIG) || !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540)
# define BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX
#endif
namespace boost {
class bad_function_call;
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
// Preferred syntax
template<typename Signature> class function;
template<typename Signature>
inline void swap(function<Signature>& f1, function<Signature>& f2)
{
f1.swap(f2);
}
#endif // have partial specialization
// Portable syntax
template<typename R> class function0;
template<typename R, typename T1> class function1;
template<typename R, typename T1, typename T2> class function2;
template<typename R, typename T1, typename T2, typename T3> class function3;
template<typename R, typename T1, typename T2, typename T3, typename T4>
class function4;
template<typename R, typename T1, typename T2, typename T3, typename T4,
typename T5>
class function5;
template<typename R, typename T1, typename T2, typename T3, typename T4,
typename T5, typename T6>
class function6;
template<typename R, typename T1, typename T2, typename T3, typename T4,
typename T5, typename T6, typename T7>
class function7;
template<typename R, typename T1, typename T2, typename T3, typename T4,
typename T5, typename T6, typename T7, typename T8>
class function8;
template<typename R, typename T1, typename T2, typename T3, typename T4,
typename T5, typename T6, typename T7, typename T8, typename T9>
class function9;
template<typename R, typename T1, typename T2, typename T3, typename T4,
typename T5, typename T6, typename T7, typename T8, typename T9,
typename T10>
class function10;
}
#endif

File diff suppressed because it is too large Load Diff

View File

@@ -1,45 +0,0 @@
// Boost.Function library - Typeof support
// Copyright (C) Douglas Gregor 2008
//
// Use, modification and distribution is 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)
//
// For more information, see http://www.boost.org
#ifndef BOOST_FUNCTION_TYPEOF_HPP
#define BOOST_FUNCTION_TYPEOF_HPP
#include <boost/function/function_fwd.hpp>
#include <boost/typeof/typeof.hpp>
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
BOOST_TYPEOF_REGISTER_TYPE(boost::bad_function_call)
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function, (typename))
#endif
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function0, (typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function1, (typename)(typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function2, (typename)(typename)(typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function3,
(typename)(typename)(typename)(typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function4,
(typename)(typename)(typename)(typename)(typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function5,
(typename)(typename)(typename)(typename)(typename)(typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function6,
(typename)(typename)(typename)(typename)(typename)(typename)(typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function7,
(typename)(typename)(typename)(typename)(typename)(typename)(typename)
(typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function8,
(typename)(typename)(typename)(typename)(typename)(typename)(typename)
(typename)(typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function9,
(typename)(typename)(typename)(typename)(typename)(typename)(typename)
(typename)(typename)(typename))
BOOST_TYPEOF_REGISTER_TEMPLATE(boost::function10,
(typename)(typename)(typename)(typename)(typename)(typename)(typename)
(typename)(typename)(typename)(typename))
#endif

View File

@@ -1,9 +1,6 @@
// Copyright Douglas Gregor 2004. // Copyright Douglas Gregor 2004. Use, modification and
// Copyright 2005 Peter Dimov // distribution is subject to the Boost Software License, Version
// 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// Use, modification and distribution is 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) // http://www.boost.org/LICENSE_1_0.txt)
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
@@ -12,16 +9,15 @@
namespace boost { namespace boost {
namespace detail {
template<typename F, typename G> template<typename F, typename G>
bool function_equal_impl(const F& f, const G& g, long) bool function_equal_impl(const F& f, const G& g, long)
{ return f == g; } { return f == g; }
} // end namespace boost::function
// function_equal_impl needs to be unqualified to pick
// user overloads on two-phase compilers
template<typename F, typename G> template<typename F, typename G>
bool function_equal(const F& f, const G& g) bool function_equal(const F& f, const G& g)
{ return function_equal_impl(f, g, 0); } { return ::boost::detail::function_equal_impl(f, g, 0); }
} // end namespace boost } // end namespace boost

View File

@@ -1,20 +1,9 @@
<html> <html>
<!--
Copyright (c) 2002 Douglas Gregor <doug.gregor -at- gmail.com>
Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt)
-->
<head> <head>
<meta http-equiv="refresh" content="0; URL=../../doc/html/function.html"> <meta http-equiv="refresh" content="0; URL=../../doc/html/function.html">
</head> </head>
<body> <body>
Automatic redirection failed, please go to Automatic redirection failed, please go to
<a href="../../doc/html/function.html">../../doc/html/function.html</a> &nbsp;<hr> <a href="../../doc/html/function.html">../../doc/html/function.html</a>
<p>© Copyright Beman Dawes, 2001</p>
<p>Distributed under the Boost Software License, Version 1.0. (See accompanying
file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy
at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
</body> </body>
</html> </html>

View File

@@ -1,19 +0,0 @@
{
"key": "function",
"name": "Function",
"authors": [
"Doug Gregor"
],
"description": "Function object wrappers for deferred calls or callbacks.",
"std": [
"tr1"
],
"category": [
"Function-objects",
"Programming"
],
"maintainers": [
"Peter Dimov <pdimov -at- gmail.com>"
],
"cxxstd": "03"
}

View File

@@ -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::function Boost::core Boost::lambda)
endif()

67
test/Jamfile Normal file
View File

@@ -0,0 +1,67 @@
# Function library
# Copyright (C) 2001-2003 Douglas Gregor
# Use, modification and distribution is 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)
# For more information, see http://www.boost.org/
# Testing Jamfile autogenerated from XML source
subproject libs/function/test ;
# bring in rules for testing
SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
include testing.jam ;
# Make tests run by default.
DEPENDS all : test ;
{
# look in BOOST_ROOT for sources first, just in this Jamfile
local SEARCH_SOURCE = $(BOOST_ROOT) $(SEARCH_SOURCE) ;
test-suite function
:
[ run libs/function/test/function_test.cpp : : : : lib_function_test ]
[ run libs/function/test/function_n_test.cpp : : : : ]
[ run libs/function/test/allocator_test.cpp : : : : ]
[ run libs/function/test/stateless_test.cpp : : : : ]
[ run libs/function/test/lambda_test.cpp : : : : ]
[ compile-fail libs/function/test/function_test_fail1.cpp : : : : ]
[ compile-fail libs/function/test/function_test_fail2.cpp : : : : ]
[ compile libs/function/test/function_30.cpp : : : : ]
[ run libs/function/test/function_arith_cxx98.cpp : : : : ]
[ run libs/function/test/function_arith_portable.cpp : : : : ]
[ run libs/function/test/sum_avg_cxx98.cpp : : : : ]
[ run libs/function/test/sum_avg_portable.cpp : : : : ]
[ run libs/function/test/mem_fun_cxx98.cpp : : : : ]
[ run libs/function/test/mem_fun_portable.cpp : : : : ]
[ run libs/function/test/std_bind_cxx98.cpp : : : : ]
[ run libs/function/test/std_bind_portable.cpp : : : : ]
[ run libs/function/test/function_ref_cxx98.cpp : : : : ]
[ run libs/function/test/function_ref_portable.cpp : : : : ]
[ run libs/function/test/contains_test.cpp : : : : ]
;
}

View File

@@ -7,82 +7,55 @@
# For more information, see http://www.boost.org/ # For more information, see http://www.boost.org/
import testing ;
project project
: default-build : source-location $(BOOST_ROOT)
<warnings>extra
: requirements
<toolset>msvc:<warnings-as-errors>on
<toolset>gcc:<warnings-as-errors>on
<toolset>clang:<warnings-as-errors>on
; ;
run function_test.cpp ; # bring in rules for testing
# /usr/include/c++/4.4/bits/shared_ptr.h:146: error: cannot use typeid with -fno-rtti import testing ;
run function_test.cpp : : : <rtti>off <toolset>gcc-4.4,<cxxstd>0x:<build>no : function_test_no_rtti ;
run function_n_test.cpp ;
run allocator_test.cpp ;
run stateless_test.cpp ;
run lambda_test.cpp ;
compile-fail function_test_fail1.cpp ;
compile-fail function_test_fail2.cpp ;
compile function_30.cpp ;
compile function_30_repeat.cpp ;
run function_arith_cxx98.cpp ;
run function_arith_portable.cpp ;
run sum_avg_cxx98.cpp ;
run sum_avg_portable.cpp ;
run mem_fun_cxx98.cpp ;
run mem_fun_portable.cpp ;
run std_bind_cxx98.cpp ;
run std_bind_portable.cpp ;
run function_ref_cxx98.cpp ;
run function_ref_portable.cpp ;
run contains_test.cpp ;
run contains2_test.cpp ;
run nothrow_swap.cpp ;
run rvalues_test.cpp ;
compile function_typeof_test.cpp ;
run result_arg_types_test.cpp ;
lib throw_bad_function_call : throw_bad_function_call.cpp : <link>shared:<define>THROW_BAD_FUNCTION_CALL_DYN_LINK=1 ; {
run test_bad_function_call.cpp throw_bad_function_call : : : <link>shared : test_bad_function_call_shared ; test-suite function
run test_bad_function_call.cpp throw_bad_function_call : : : <link>static : test_bad_function_call_static ; :
[ run libs/function/test/function_test.cpp : : : : lib_function_test ]
lib mixed_cxxstd : mixed_cxxstd.cpp : <link>shared:<define>MIXED_CXXSTD_DYN_LINK=1 ; [ run libs/function/test/function_n_test.cpp : : : : ]
run test_mixed_cxxstd.cpp mixed_cxxstd : : : <link>shared : mixed_cxxstd_shared ; [ run libs/function/test/allocator_test.cpp ../../../libs/test/build//boost_test_exec_monitor : : : : ]
run test_mixed_cxxstd.cpp mixed_cxxstd : : : <link>static : mixed_cxxstd_static ;
run test_mixed_cxxstd.cpp mixed_cxxstd/<cxxstd>98 : : : <link>shared : mixed_cxxstd_shared_98 ; [ run libs/function/test/stateless_test.cpp ../../../libs/test/build//boost_test_exec_monitor : : : : ]
run test_mixed_cxxstd.cpp mixed_cxxstd/<cxxstd>98 : : : <link>static : mixed_cxxstd_static_98 ;
run test_mixed_cxxstd.cpp mixed_cxxstd/<cxxstd>0x : : : <link>shared : mixed_cxxstd_shared_0x ; [ run libs/function/test/lambda_test.cpp ../../../libs/test/build//boost_test_exec_monitor : : : : ]
run test_mixed_cxxstd.cpp mixed_cxxstd/<cxxstd>0x : : : <link>static : mixed_cxxstd_static_0x ;
local check14 = [ check-target-builds mixed_cxxstd/<cxxstd>14 : : <build>no ] ; [ compile-fail libs/function/test/function_test_fail1.cpp : : : : ]
run test_mixed_cxxstd.cpp mixed_cxxstd/<cxxstd>14 : : : <link>shared $(check14) : mixed_cxxstd_shared_14 ; [ compile-fail libs/function/test/function_test_fail2.cpp : : : : ]
run test_mixed_cxxstd.cpp mixed_cxxstd/<cxxstd>14 : : : <link>static $(check14) : mixed_cxxstd_static_14 ;
lib return_function : return_function.cpp : <link>shared:<define>RETURN_FUNCTION_DYN_LINK=1 ; [ compile libs/function/test/function_30.cpp : : : : ]
run test_return_function.cpp return_function : : : <link>shared : return_function_shared ; [ run libs/function/test/function_arith_cxx98.cpp : : : : ]
run test_return_function.cpp return_function : : : <link>static : return_function_static ;
run test_return_function.cpp return_function/<cxxstd>98 : : : <link>shared : return_function_shared_98 ; [ run libs/function/test/function_arith_portable.cpp : : : : ]
run test_return_function.cpp return_function/<cxxstd>98 : : : <link>static : return_function_static_98 ;
run test_return_function.cpp return_function/<cxxstd>0x : : : <link>shared : return_function_shared_0x ; [ run libs/function/test/sum_avg_cxx98.cpp : : : : ]
run test_return_function.cpp return_function/<cxxstd>0x : : : <link>static : return_function_static_0x ;
run test_return_function.cpp return_function/<cxxstd>14 : : : <link>shared $(check14) : return_function_shared_14 ; [ run libs/function/test/sum_avg_portable.cpp : : : : ]
run test_return_function.cpp return_function/<cxxstd>14 : : : <link>static $(check14) : return_function_static_14 ;
run quick.cpp ; [ run libs/function/test/mem_fun_cxx98.cpp : : : : ]
compile issue_42.cpp ; [ run libs/function/test/mem_fun_portable.cpp : : : : ]
[ run libs/function/test/std_bind_cxx98.cpp : : : : ]
[ run libs/function/test/std_bind_portable.cpp : : : : ]
[ run libs/function/test/function_ref_cxx98.cpp : : : : ]
[ run libs/function/test/function_ref_portable.cpp : : : : ]
[ run libs/function/test/contains_test.cpp : : : : ]
;
}
run fn_eq_bind_test.cpp ;

View File

@@ -7,10 +7,10 @@
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
#include <boost/function.hpp> #include <boost/test/minimal.hpp>
#include <boost/core/lightweight_test.hpp>
#include <cassert> #include <cassert>
#include <functional> #include <functional>
#include <boost/function.hpp>
using namespace std; using namespace std;
using namespace boost; using namespace boost;
@@ -27,14 +27,6 @@ struct counting_allocator : public std::allocator<T>
typedef counting_allocator<U> other; typedef counting_allocator<U> other;
}; };
counting_allocator()
{
}
template<typename U>
counting_allocator( counting_allocator<U> )
{
}
T* allocate(std::size_t n) T* allocate(std::size_t n)
{ {
@@ -49,88 +41,41 @@ struct counting_allocator : public std::allocator<T>
} }
}; };
struct enable_small_object_optimization
{
};
struct disable_small_object_optimization
{
int unused_state_data[32];
};
template <typename base>
struct plus_int: base
{
int operator()(int x, int y) const { return x + y; }
};
static int do_minus(int x, int y) { return x-y; } static int do_minus(int x, int y) { return x-y; }
template <typename base> struct DoNothing
struct DoNothing: base
{ {
void operator()() const {} void operator()() const {}
}; };
static void do_nothing() {} static void do_nothing() {}
int main() int
test_main(int, char*[])
{ {
function2<int, int, int> f; function2<int, int, int, counting_allocator<int> > f;
f.assign( plus_int<disable_small_object_optimization>(), counting_allocator<int>() ); f = plus<int>();
f.clear();
BOOST_TEST_EQ( alloc_count, 1 );
BOOST_TEST_EQ( dealloc_count, 1 );
alloc_count = 0;
dealloc_count = 0;
f.assign( plus_int<enable_small_object_optimization>(), counting_allocator<int>() );
f.clear();
BOOST_TEST_EQ( alloc_count, 0 );
BOOST_TEST_EQ( dealloc_count, 0 );
f.assign( plus_int<disable_small_object_optimization>(), std::allocator<int>() );
f.clear();
f.assign( plus_int<enable_small_object_optimization>(), std::allocator<int>() );
f.clear(); f.clear();
BOOST_TEST(alloc_count == 1);
BOOST_TEST(dealloc_count == 1);
alloc_count = 0; alloc_count = 0;
dealloc_count = 0; dealloc_count = 0;
f.assign( &do_minus, counting_allocator<int>() ); f = &do_minus;
f.clear();
BOOST_TEST_EQ( alloc_count, 0 );
BOOST_TEST_EQ( dealloc_count, 0 );
f.assign( &do_minus, std::allocator<int>() );
f.clear(); f.clear();
function0<void> fv; function0<void, counting_allocator<int> > fv;
alloc_count = 0; alloc_count = 0;
dealloc_count = 0; dealloc_count = 0;
fv.assign( DoNothing<disable_small_object_optimization>(), counting_allocator<int>() ); fv = DoNothing();
fv.clear();
BOOST_TEST_EQ( alloc_count, 1 );
BOOST_TEST_EQ( dealloc_count, 1 );
alloc_count = 0;
dealloc_count = 0;
fv.assign( DoNothing<enable_small_object_optimization>(), counting_allocator<int>() );
fv.clear();
BOOST_TEST_EQ( alloc_count, 0 );
BOOST_TEST_EQ( dealloc_count, 0 );
fv.assign( DoNothing<disable_small_object_optimization>(), std::allocator<int>() );
fv.clear();
fv.assign( DoNothing<enable_small_object_optimization>(), std::allocator<int>() );
fv.clear(); fv.clear();
BOOST_TEST(alloc_count == 1);
BOOST_TEST(dealloc_count == 1);
alloc_count = 0; alloc_count = 0;
dealloc_count = 0; dealloc_count = 0;
fv.assign( &do_nothing, counting_allocator<int>() ); fv = &do_nothing;
fv.clear();
BOOST_TEST_EQ( alloc_count, 0 );
BOOST_TEST_EQ( dealloc_count, 0 );
fv.assign( &do_nothing, std::allocator<int>() );
fv.clear(); fv.clear();
function0<void> fv2; return 0;
fv.assign(&do_nothing, std::allocator<int>() );
fv2.assign(fv, std::allocator<int>() );
return boost::report_errors();
} }

View File

@@ -1,17 +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_function REQUIRED)
add_executable(main main.cpp)
target_link_libraries(main Boost::function)
enable_testing()
add_test(main main)
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

View File

@@ -1,22 +0,0 @@
// Copyright 2017, 2021 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0.
// https://www.boost.org/LICENSE_1_0.txt
// See library home page at http://www.boost.org/libs/function
#include <boost/function.hpp>
#include <cassert>
#define BOOST_TEST(expr) assert(expr)
#define BOOST_TEST_EQ(x1, x2) assert((x1)==(x2))
int add( int x, int y )
{
return x + y;
}
int main()
{
boost::function<int(int, int)> fn( &add );
BOOST_TEST_EQ( fn( 1, 2 ), 3 );
}

View File

@@ -1,47 +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.20)
project(cmake_subdir_test LANGUAGES CXX)
add_subdirectory(../.. boostorg/function)
set(deps
# Primary dependencies
assert
bind
config
core
preprocessor
throw_exception
type_index
type_traits
typeof
# Secondary dependencies
static_assert
container_hash
describe
mp11
)
foreach(dep IN LISTS deps)
add_subdirectory(../../../${dep} boostorg/${dep})
endforeach()
# --target check
add_executable(quick ../quick.cpp)
target_link_libraries(quick Boost::function Boost::core)
enable_testing()
add_test(quick quick)
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

View File

@@ -1,88 +0,0 @@
// Boost.Function library
// Copyright Douglas Gregor 2004.
// Copyright 2005 Peter Dimov
// Use, modification and distribution is 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)
#include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
static int forty_two()
{
return 42;
}
struct Seventeen
{
int operator()() const
{
return 17;
}
};
bool operator==(const Seventeen&, const Seventeen&)
{
return true;
}
struct ReturnInt
{
explicit ReturnInt(int value) : value(value)
{
}
int operator()() const
{
return value;
}
int value;
};
bool operator==(const ReturnInt& x, const ReturnInt& y)
{
return x.value == y.value;
}
bool operator!=(const ReturnInt& x, const ReturnInt& y)
{
return x.value != y.value;
}
int main()
{
boost::function0<int> fn;
fn = &forty_two;
BOOST_TEST( fn() == 42 );
BOOST_TEST( fn.contains(&forty_two) );
BOOST_TEST( !fn.contains( Seventeen() ) );
BOOST_TEST( !fn.contains( ReturnInt(0) ) );
BOOST_TEST( !fn.contains( ReturnInt(12) ) );
fn = Seventeen();
BOOST_TEST( fn() == 17 );
BOOST_TEST( !fn.contains( &forty_two ) );
BOOST_TEST( fn.contains( Seventeen() ) );
BOOST_TEST( !fn.contains( ReturnInt(0) ) );
BOOST_TEST( !fn.contains( ReturnInt(12) ) );
fn = ReturnInt(12);
BOOST_TEST( fn() == 12 );
BOOST_TEST( !fn.contains( &forty_two ) );
BOOST_TEST( !fn.contains( Seventeen() ) );
BOOST_TEST( !fn.contains( ReturnInt(0) ) );
BOOST_TEST( fn.contains( ReturnInt(12) ) );
return boost::report_errors();
}

View File

@@ -5,12 +5,10 @@
// 1.0. (See accompanying file LICENSE_1_0.txt or copy at // 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#include <boost/test/minimal.hpp>
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
#include <boost/ref.hpp> #include <boost/ref.hpp>
#define BOOST_CHECK BOOST_TEST
static int forty_two() { return 42; } static int forty_two() { return 42; }
struct Seventeen struct Seventeen
@@ -33,72 +31,23 @@ bool operator==(const ReturnInt& x, const ReturnInt& y)
bool operator!=(const ReturnInt& x, const ReturnInt& y) bool operator!=(const ReturnInt& x, const ReturnInt& y)
{ return x.value != y.value; } { return x.value != y.value; }
namespace contain_test {
struct ReturnIntFE
{
explicit ReturnIntFE(int value) : value(value) {}
int operator()() const { return value; }
int value;
};
}
#ifndef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
namespace contain_test {
# ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
bool function_equal(const ReturnIntFE& x, const ReturnIntFE& y)
{ return x.value == y.value; }
# else
bool function_equal_impl(const ReturnIntFE& x, const ReturnIntFE& y, int)
{ return x.value == y.value; }
# endif // #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
}
#else // BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
namespace boost {
# ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
bool
function_equal(const contain_test::ReturnIntFE& x,
const contain_test::ReturnIntFE& y)
{ return x.value == y.value; }
# else
bool
function_equal_impl(const contain_test::ReturnIntFE& x,
const contain_test::ReturnIntFE& y, int)
{ return x.value == y.value; }
# endif
}
#endif
static void target_test() static void target_test()
{ {
boost::function0<int> f; boost::function0<int> f;
f = &forty_two; f = &forty_two;
BOOST_CHECK(*f.target<int (*)()>() == &forty_two); BOOST_TEST(*f.target<int (*)()>() == &forty_two);
BOOST_CHECK(!f.target<Seventeen>()); BOOST_TEST(!f.target<Seventeen>());
f = Seventeen(); f = Seventeen();
BOOST_CHECK(!f.target<int (*)()>()); BOOST_TEST(!f.target<int (*)()>());
BOOST_CHECK(f.target<Seventeen>()); BOOST_TEST(f.target<Seventeen>());
Seventeen this_seventeen; Seventeen this_seventeen;
f = boost::ref(this_seventeen); f = boost::ref(this_seventeen);
BOOST_CHECK(!f.target<int (*)()>()); BOOST_TEST(!f.target<int (*)()>());
BOOST_CHECK(f.target<Seventeen>()); BOOST_TEST(f.target<Seventeen>());
BOOST_CHECK(f.target<Seventeen>() == &this_seventeen); BOOST_TEST(f.target<Seventeen>() == &this_seventeen);
const Seventeen const_seventeen = this_seventeen;
f = boost::ref(const_seventeen);
BOOST_CHECK(!f.target<int (*)()>());
BOOST_CHECK(f.target<const Seventeen>());
BOOST_CHECK(f.target<const Seventeen>() == &const_seventeen);
BOOST_CHECK(f.target<const volatile Seventeen>());
BOOST_CHECK(!f.target<Seventeen>());
BOOST_CHECK(!f.target<volatile Seventeen>());
} }
static void equal_test() static void equal_test()
@@ -106,58 +55,46 @@ static void equal_test()
boost::function0<int> f; boost::function0<int> f;
f = &forty_two; f = &forty_two;
BOOST_CHECK(f == &forty_two); BOOST_TEST(f == &forty_two);
BOOST_CHECK(f != ReturnInt(17)); BOOST_TEST(f != ReturnInt(17));
#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) #if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
BOOST_CHECK(&forty_two == f); BOOST_TEST(&forty_two == f);
BOOST_CHECK(ReturnInt(17) != f); BOOST_TEST(ReturnInt(17) != f);
#endif #endif
BOOST_CHECK(f.contains(&forty_two)); BOOST_TEST(f.contains(&forty_two));
f = ReturnInt(17); f = ReturnInt(17);
BOOST_CHECK(f != &forty_two); BOOST_TEST(f != &forty_two);
BOOST_CHECK(f == ReturnInt(17)); BOOST_TEST(f == ReturnInt(17));
BOOST_CHECK(f != ReturnInt(16)); BOOST_TEST(f != ReturnInt(16));
#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) #if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
BOOST_CHECK(&forty_two != f); BOOST_TEST(&forty_two != f);
BOOST_CHECK(ReturnInt(17) == f); BOOST_TEST(ReturnInt(17) == f);
BOOST_CHECK(ReturnInt(16) != f); BOOST_TEST(ReturnInt(16) != f);
#endif #endif
BOOST_CHECK(f.contains(ReturnInt(17))); BOOST_TEST(f.contains(ReturnInt(17)));
f = contain_test::ReturnIntFE(17);
BOOST_CHECK(f != &forty_two);
BOOST_CHECK(f == contain_test::ReturnIntFE(17));
BOOST_CHECK(f != contain_test::ReturnIntFE(16));
#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
BOOST_CHECK(&forty_two != f);
BOOST_CHECK(contain_test::ReturnIntFE(17) == f);
BOOST_CHECK(contain_test::ReturnIntFE(16) != f);
#endif
BOOST_CHECK(f.contains(contain_test::ReturnIntFE(17)));
#if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX) #if !defined(BOOST_FUNCTION_NO_FUNCTION_TYPE_SYNTAX)
boost::function<int(void)> g; boost::function<int(void)> g;
g = &forty_two; g = &forty_two;
BOOST_CHECK(g == &forty_two); BOOST_TEST(g == &forty_two);
BOOST_CHECK(g != ReturnInt(17)); BOOST_TEST(g != ReturnInt(17));
# if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) # if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
BOOST_CHECK(&forty_two == g); BOOST_TEST(&forty_two == g);
BOOST_CHECK(ReturnInt(17) != g); BOOST_TEST(ReturnInt(17) != g);
# endif # endif
g = ReturnInt(17); g = ReturnInt(17);
BOOST_CHECK(g != &forty_two); BOOST_TEST(g != &forty_two);
BOOST_CHECK(g == ReturnInt(17)); BOOST_TEST(g == ReturnInt(17));
BOOST_CHECK(g != ReturnInt(16)); BOOST_TEST(g != ReturnInt(16));
# if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) # if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
BOOST_CHECK(&forty_two != g); BOOST_TEST(&forty_two != g);
BOOST_CHECK(ReturnInt(17) == g); BOOST_TEST(ReturnInt(17) == g);
BOOST_CHECK(ReturnInt(16) != g); BOOST_TEST(ReturnInt(16) != g);
# endif # endif
#endif #endif
} }
@@ -169,28 +106,28 @@ static void ref_equal_test()
boost::function0<int> f = boost::ref(ri); boost::function0<int> f = boost::ref(ri);
// References and values are equal // References and values are equal
BOOST_CHECK(f == boost::ref(ri)); BOOST_TEST(f == boost::ref(ri));
BOOST_CHECK(f == ri); BOOST_TEST(f == ri);
BOOST_CHECK(boost::ref(ri) == f); BOOST_TEST(boost::ref(ri) == f);
BOOST_CHECK(!(f != boost::ref(ri))); BOOST_TEST(!(f != boost::ref(ri)));
BOOST_CHECK(!(f != ri)); BOOST_TEST(!(f != ri));
BOOST_CHECK(!(boost::ref(ri) != f)); BOOST_TEST(!(boost::ref(ri) != f));
#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) #if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
BOOST_CHECK(ri == f); BOOST_TEST(ri == f);
BOOST_CHECK(!(ri != f)); BOOST_TEST(!(ri != f));
#endif #endif
// Values equal, references inequal // Values equal, references inequal
ReturnInt ri2(17); ReturnInt ri2(17);
BOOST_CHECK(f == ri2); BOOST_TEST(f == ri2);
BOOST_CHECK(f != boost::ref(ri2)); BOOST_TEST(f != boost::ref(ri2));
BOOST_CHECK(boost::ref(ri2) != f); BOOST_TEST(boost::ref(ri2) != f);
BOOST_CHECK(!(f != ri2)); BOOST_TEST(!(f != ri2));
BOOST_CHECK(!(f == boost::ref(ri2))); BOOST_TEST(!(f == boost::ref(ri2)));
BOOST_CHECK(!(boost::ref(ri2) == f)); BOOST_TEST(!(boost::ref(ri2) == f));
#if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) #if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
BOOST_CHECK(ri2 == f); BOOST_TEST(ri2 == f);
BOOST_CHECK(!(ri2 != f)); BOOST_TEST(!(ri2 != f));
#endif #endif
} }
@@ -200,38 +137,38 @@ static void ref_equal_test()
boost::function<int(void)> f = boost::ref(ri); boost::function<int(void)> f = boost::ref(ri);
// References and values are equal // References and values are equal
BOOST_CHECK(f == boost::ref(ri)); BOOST_TEST(f == boost::ref(ri));
BOOST_CHECK(f == ri); BOOST_TEST(f == ri);
BOOST_CHECK(boost::ref(ri) == f); BOOST_TEST(boost::ref(ri) == f);
BOOST_CHECK(!(f != boost::ref(ri))); BOOST_TEST(!(f != boost::ref(ri)));
BOOST_CHECK(!(f != ri)); BOOST_TEST(!(f != ri));
BOOST_CHECK(!(boost::ref(ri) != f)); BOOST_TEST(!(boost::ref(ri) != f));
# if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) # if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
BOOST_CHECK(ri == f); BOOST_TEST(ri == f);
BOOST_CHECK(!(ri != f)); BOOST_TEST(!(ri != f));
# endif # endif
// Values equal, references inequal // Values equal, references inequal
ReturnInt ri2(17); ReturnInt ri2(17);
BOOST_CHECK(f == ri2); BOOST_TEST(f == ri2);
BOOST_CHECK(f != boost::ref(ri2)); BOOST_TEST(f != boost::ref(ri2));
BOOST_CHECK(boost::ref(ri2) != f); BOOST_TEST(boost::ref(ri2) != f);
BOOST_CHECK(!(f != ri2)); BOOST_TEST(!(f != ri2));
BOOST_CHECK(!(f == boost::ref(ri2))); BOOST_TEST(!(f == boost::ref(ri2)));
BOOST_CHECK(!(boost::ref(ri2) == f)); BOOST_TEST(!(boost::ref(ri2) == f));
# if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3) # if !(defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ <= 3)
BOOST_CHECK(ri2 == f); BOOST_TEST(ri2 == f);
BOOST_CHECK(!(ri2 != f)); BOOST_TEST(!(ri2 != f));
# endif # endif
} }
#endif #endif
} }
int main() int test_main(int, char*[])
{ {
target_test(); target_test();
equal_test(); equal_test();
ref_equal_test(); ref_equal_test();
return boost::report_errors(); return 0;
} }

View File

@@ -1,87 +0,0 @@
// Copyright 2023 Peter Dimov
// Distributed under the Boost Software License, Version 1.0.
// https://www.boost.org/LICENSE_1_0.txt
#include <boost/function.hpp>
#include <boost/bind/bind.hpp>
#include <boost/core/lightweight_test.hpp>
using namespace boost::placeholders;
int f1() { return 1; }
int f2() { return 2; }
int main()
{
{
boost::function<int()> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
{
boost::function<int(int)> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
{
boost::function<int(int, int)> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
{
boost::function<int(int, int, int)> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
{
boost::function<int(int, int, int, int)> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
{
boost::function<int(int, int, int, int, int)> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
{
boost::function<int(int, int, int, int, int, int)> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
{
boost::function<int(int, int, int, int, int, int, int)> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
{
boost::function<int(int, int, int, int, int, int, int, int)> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
{
boost::function<int(int, int, int, int, int, int, int, int, int)> fn( boost::bind( f1 ) );
BOOST_TEST( fn == boost::bind( f1 ) );
BOOST_TEST( fn != boost::bind( f2 ) );
}
return boost::report_errors();
}

View File

@@ -1,35 +0,0 @@
// Boost.Function library
// Copyright Douglas Gregor 2002-2003. Use, modification and
// distribution is 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)
// For more information, see http://www.boost.org
// Make sure we don't try to redefine function2
#include <boost/function/function2.hpp>
// Define all Boost.Function class templates up to 30 arguments
#define BOOST_FUNCTION_MAX_ARGS 20
#include <boost/function.hpp>
#undef BOOST_FUNCTION_MAX_ARGS
#define BOOST_FUNCTION_MAX_ARGS 40
#include <boost/function.hpp>
#undef BOOST_FUNCTION_MAX_ARGS
#define BOOST_FUNCTION_MAX_ARGS 25
#include <boost/function.hpp>
#undef BOOST_FUNCTION_MAX_ARGS
#define BOOST_FUNCTION_MAX_ARGS 30
#include <boost/function.hpp>
#include <boost/function.hpp>
int main()
{
boost::function0<float> f0;
boost::function30<float, int, int, int, int, int, int, int, int, int, int,
int, int, int, int, int, int, int, int, int, int,
int, int, int, int, int, int, int, int, int, int> f30;
return 0;
}

View File

@@ -7,20 +7,12 @@
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
#if defined(__clang__) && defined(__has_warning) #include <boost/test/minimal.hpp>
# if __has_warning( "-Wself-assign-overloaded" )
# pragma clang diagnostic ignored "-Wself-assign-overloaded"
# endif
#endif
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
#include <functional> #include <functional>
#include <cassert> #include <cassert>
#include <string> #include <string>
#define BOOST_CHECK BOOST_TEST
using namespace boost; using namespace boost;
using std::string; using std::string;
using std::negate; using std::negate;
@@ -64,30 +56,30 @@ test_zero_args()
// Default construction // Default construction
func_void_type v1; func_void_type v1;
BOOST_CHECK(v1.empty()); BOOST_TEST(v1.empty());
// Assignment to an empty function // Assignment to an empty function
v1 = five; v1 = five;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v1.clear(); v1.clear();
BOOST_CHECK(!v1); BOOST_TEST(!v1);
// Assignment to an empty function // Assignment to an empty function
v1 = three; v1 = three;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation and self-assignment // Invocation and self-assignment
global_int = 0; global_int = 0;
v1 = v1; v1 = v1;
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v1 = five; v1 = five;
@@ -96,61 +88,61 @@ test_zero_args()
global_int = 0; global_int = 0;
v1 = (v1); v1 = (v1);
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear // clear
v1 = 0; v1 = 0;
BOOST_CHECK(v1.empty()); BOOST_TEST(v1.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v1 = &write_five; v1 = &write_five;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v1 = &write_three; v1 = &write_three;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v1 = five; v1 = five;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v1 = write_three; v1 = write_three;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Construction from another function (that is empty) // Construction from another function (that is empty)
v1.clear(); v1.clear();
func_void_type v2(v1); func_void_type v2(v1);
BOOST_CHECK(!v2? true : false); BOOST_TEST(!v2? true : false);
// Assignment to an empty function // Assignment to an empty function
v2 = three; v2 = three;
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v2 = (five); v2 = (five);
@@ -158,86 +150,86 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
v2.clear(); v2.clear();
BOOST_CHECK(v2.empty()); BOOST_TEST(v2.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v2 = (&write_five); v2 = (&write_five);
BOOST_CHECK(v2? true : false); BOOST_TEST(v2? true : false);
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v2 = &write_three; v2 = &write_three;
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Swapping // Swapping
v1 = five; v1 = five;
swap(v1, v2); swap(v1, v2);
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
swap(v1, v2); swap(v1, v2);
v1.clear(); v1.clear();
// Assignment // Assignment
v2 = five; v2 = five;
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v2 = &write_three; v2 = &write_three;
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a function from an empty function // Assignment to a function from an empty function
v2 = v1; v2 = v1;
BOOST_CHECK(v2.empty()); BOOST_TEST(v2.empty());
// Assignment to a function from a function with a functor // Assignment to a function from a function with a functor
v1 = three; v1 = three;
v2 = v1; v2 = v1;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assign to a function from a function with a function // Assign to a function from a function with a function
v2 = &write_five; v2 = &write_five;
v1 = v2; v1 = v2;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Construct a function given another function containing a function // Construct a function given another function containing a function
func_void_type v3(v1); func_void_type v3(v1);
@@ -245,20 +237,20 @@ test_zero_args()
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v3.clear(); v3.clear();
BOOST_CHECK(!v3? true : false); BOOST_TEST(!v3? true : false);
// Assignment to an empty function // Assignment to an empty function
v3 = three; v3 = three;
BOOST_CHECK(!v3.empty()); BOOST_TEST(!v3.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v3 = five; v3 = five;
@@ -266,38 +258,38 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() // clear()
v3.clear(); v3.clear();
BOOST_CHECK(v3.empty()); BOOST_TEST(v3.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v3 = &write_five; v3 = &write_five;
BOOST_CHECK(!v3.empty()); BOOST_TEST(!v3.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v3 = &write_three; v3 = &write_three;
BOOST_CHECK(!v3.empty()); BOOST_TEST(!v3.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v3 = five; v3 = five;
BOOST_CHECK(!v3.empty()); BOOST_TEST(!v3.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Construction of a function from a function containing a functor // Construction of a function from a function containing a functor
func_void_type v4(v3); func_void_type v4(v3);
@@ -305,20 +297,20 @@ test_zero_args()
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v4.clear(); v4.clear();
BOOST_CHECK(v4.empty()); BOOST_TEST(v4.empty());
// Assignment to an empty function // Assignment to an empty function
v4 = three; v4 = three;
BOOST_CHECK(!v4.empty()); BOOST_TEST(!v4.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v4 = five; v4 = five;
@@ -326,38 +318,38 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() // clear()
v4.clear(); v4.clear();
BOOST_CHECK(v4.empty()); BOOST_TEST(v4.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v4 = &write_five; v4 = &write_five;
BOOST_CHECK(!v4.empty()); BOOST_TEST(!v4.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v4 = &write_three; v4 = &write_three;
BOOST_CHECK(!v4.empty()); BOOST_TEST(!v4.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v4 = five; v4 = five;
BOOST_CHECK(!v4.empty()); BOOST_TEST(!v4.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Construction of a function from a functor // Construction of a function from a functor
func_void_type v5(five); func_void_type v5(five);
@@ -365,20 +357,20 @@ test_zero_args()
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v5.clear(); v5.clear();
BOOST_CHECK(v5.empty()); BOOST_TEST(v5.empty());
// Assignment to an empty function // Assignment to an empty function
v5 = three; v5 = three;
BOOST_CHECK(!v5.empty()); BOOST_TEST(!v5.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v5 = five; v5 = five;
@@ -386,38 +378,38 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() // clear()
v5.clear(); v5.clear();
BOOST_CHECK(v5.empty()); BOOST_TEST(v5.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v5 = &write_five; v5 = &write_five;
BOOST_CHECK(!v5.empty()); BOOST_TEST(!v5.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v5 = &write_three; v5 = &write_three;
BOOST_CHECK(!v5.empty()); BOOST_TEST(!v5.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v5 = five; v5 = five;
BOOST_CHECK(!v5.empty()); BOOST_TEST(!v5.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Construction of a function from a function // Construction of a function from a function
func_void_type v6(&write_five); func_void_type v6(&write_five);
@@ -425,20 +417,20 @@ test_zero_args()
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v6.clear(); v6.clear();
BOOST_CHECK(v6.empty()); BOOST_TEST(v6.empty());
// Assignment to an empty function // Assignment to an empty function
v6 = three; v6 = three;
BOOST_CHECK(!v6.empty()); BOOST_TEST(!v6.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v6 = five; v6 = five;
@@ -446,38 +438,38 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() // clear()
v6.clear(); v6.clear();
BOOST_CHECK(v6.empty()); BOOST_TEST(v6.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v6 = &write_five; v6 = &write_five;
BOOST_CHECK(!v6.empty()); BOOST_TEST(!v6.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v6 = &write_three; v6 = &write_three;
BOOST_CHECK(!v6.empty()); BOOST_TEST(!v6.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v6 = five; v6 = five;
BOOST_CHECK(!v6.empty()); BOOST_TEST(!v6.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Const vs. non-const // Const vs. non-const
// Initialization for Borland C++ 5.5 // Initialization for Borland C++ 5.5
@@ -487,19 +479,19 @@ test_zero_args()
global_int = 0; global_int = 0;
v7(); v7();
BOOST_CHECK(global_int == 2); BOOST_TEST(global_int == 2);
global_int = 0; global_int = 0;
v8(); v8();
BOOST_CHECK(global_int == 2); BOOST_TEST(global_int == 2);
// Test construction from 0 and comparison to 0 // Test construction from 0 and comparison to 0
func_void_type v9(0); func_void_type v9(0);
BOOST_CHECK(v9 == 0); BOOST_TEST(v9 == 0);
# if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540 || defined(BOOST_STRICT_CONFIG) # if !defined(__SUNPRO_CC) || __SUNPRO_CC > 0x540 || defined(BOOST_STRICT_CONFIG)
BOOST_CHECK(0 == v9); BOOST_TEST(0 == v9);
#else #else
BOOST_CHECK(v9.empty()); BOOST_TEST(v9.empty());
#endif #endif
// Test return values // Test return values
@@ -509,31 +501,31 @@ test_zero_args()
generate_three_obj gen_three = generate_three_obj(); generate_three_obj gen_three = generate_three_obj();
func_int_type i0(gen_five); func_int_type i0(gen_five);
BOOST_CHECK(i0() == 5); BOOST_TEST(i0() == 5);
i0 = gen_three; i0 = gen_three;
BOOST_CHECK(i0() == 3); BOOST_TEST(i0() == 3);
i0 = &generate_five; i0 = &generate_five;
BOOST_CHECK(i0() == 5); BOOST_TEST(i0() == 5);
i0 = &generate_three; i0 = &generate_three;
BOOST_CHECK(i0() == 3); BOOST_TEST(i0() == 3);
BOOST_CHECK(i0? true : false); BOOST_TEST(i0? true : false);
i0.clear(); i0.clear();
BOOST_CHECK(!i0? true : false); BOOST_TEST(!i0? true : false);
// Test return values with compatible types // Test return values with compatible types
typedef function0<long> func_long_type; typedef function0<long> func_long_type;
func_long_type i1(gen_five); func_long_type i1(gen_five);
BOOST_CHECK(i1() == 5); BOOST_TEST(i1() == 5);
i1 = gen_three; i1 = gen_three;
BOOST_CHECK(i1() == 3); BOOST_TEST(i1() == 3);
i1 = &generate_five; i1 = &generate_five;
BOOST_CHECK(i1() == 5); BOOST_TEST(i1() == 5);
i1 = &generate_three; i1 = &generate_three;
BOOST_CHECK(i1() == 3); BOOST_TEST(i1() == 3);
BOOST_CHECK(i1? true : false); BOOST_TEST(i1? true : false);
i1.clear(); i1.clear();
BOOST_CHECK(!i1? true : false); BOOST_TEST(!i1? true : false);
} }
static void static void
@@ -542,45 +534,45 @@ test_one_arg()
negate<int> neg = negate<int>(); // Initialization for Borland C++ 5.5 negate<int> neg = negate<int>(); // Initialization for Borland C++ 5.5
function1<int, int> f1(neg); function1<int, int> f1(neg);
BOOST_CHECK(f1(5) == -5); BOOST_TEST(f1(5) == -5);
function1<string, string> id(&identity_str); function1<string, string> id(&identity_str);
BOOST_CHECK(id("str") == "str"); BOOST_TEST(id("str") == "str");
function1<std::string, const char*> id2(&identity_str); function1<std::string, const char*> id2(&identity_str);
BOOST_CHECK(id2("foo") == "foo"); BOOST_TEST(id2("foo") == "foo");
add_to_obj add_to(5); add_to_obj add_to(5);
function1<int, int> f2(add_to); function1<int, int> f2(add_to);
BOOST_CHECK(f2(3) == 8); BOOST_TEST(f2(3) == 8);
const function1<int, int> cf2(add_to); const function1<int, int> cf2(add_to);
BOOST_CHECK(cf2(3) == 8); BOOST_TEST(cf2(3) == 8);
} }
static void static void
test_two_args() test_two_args()
{ {
function2<string, const string&, const string&> cat(&string_cat); function2<string, const string&, const string&> cat(&string_cat);
BOOST_CHECK(cat("str", "ing") == "string"); BOOST_TEST(cat("str", "ing") == "string");
function2<int, short, short> sum(&sum_ints); function2<int, short, short> sum(&sum_ints);
BOOST_CHECK(sum(2, 3) == 5); BOOST_TEST(sum(2, 3) == 5);
} }
static void static void
test_emptiness() test_emptiness()
{ {
function0<float> f1; function0<float> f1;
BOOST_CHECK(f1.empty()); BOOST_TEST(f1.empty());
function0<float> f2; function0<float> f2;
f2 = f1; f2 = f1;
BOOST_CHECK(f2.empty()); BOOST_TEST(f2.empty());
function0<double> f3; function0<double> f3;
f3 = f2; f3 = f2;
BOOST_CHECK(f3.empty()); BOOST_TEST(f3.empty());
} }
struct X { struct X {
@@ -601,18 +593,18 @@ test_member_functions()
X one(1); X one(1);
X five(5); X five(5);
BOOST_CHECK(f1(&one) == 2); BOOST_TEST(f1(&one) == 2);
BOOST_CHECK(f1(&five) == 10); BOOST_TEST(f1(&five) == 10);
boost::function1<int, X*> f1_2; boost::function1<int, X*> f1_2;
f1_2 = &X::twice; f1_2 = &X::twice;
BOOST_CHECK(f1_2(&one) == 2); BOOST_TEST(f1_2(&one) == 2);
BOOST_CHECK(f1_2(&five) == 10); BOOST_TEST(f1_2(&five) == 10);
boost::function2<int, X&, int> f2(&X::plus); boost::function2<int, X&, int> f2(&X::plus);
BOOST_CHECK(f2(one, 3) == 4); BOOST_TEST(f2(one, 3) == 4);
BOOST_CHECK(f2(five, 4) == 9); BOOST_TEST(f2(five, 4) == 9);
} }
struct add_with_throw_on_copy { struct add_with_throw_on_copy {
@@ -637,62 +629,14 @@ test_ref()
add_with_throw_on_copy atc; add_with_throw_on_copy atc;
try { try {
boost::function2<int, int, int> f(ref(atc)); boost::function2<int, int, int> f(ref(atc));
BOOST_CHECK(f(1, 3) == 4); BOOST_TEST(f(1, 3) == 4);
} }
catch(std::runtime_error const&) { catch(std::runtime_error e) {
BOOST_ERROR("Nonthrowing constructor threw an exception"); BOOST_ERROR("Nonthrowing constructor threw an exception");
} }
} }
static unsigned construction_count = 0; int test_main(int, char* [])
static unsigned destruction_count = 0;
struct MySmallFunctor {
MySmallFunctor() { ++construction_count; }
MySmallFunctor(const MySmallFunctor &) { ++construction_count; }
~MySmallFunctor() { ++destruction_count; }
int operator()() { return 0; }
};
struct MyLargeFunctor {
MyLargeFunctor() { ++construction_count; }
MyLargeFunctor(const MyLargeFunctor &) { ++construction_count; }
~MyLargeFunctor() { ++destruction_count; }
int operator()() { return 0; }
float data[128];
};
void test_construct_destroy_count()
{
{
boost::function0<int> f;
boost::function0<int> g;
f = MySmallFunctor();
g = MySmallFunctor();
f.swap(g);
}
// MySmallFunctor objects should be constructed as many times as
// they are destroyed.
BOOST_CHECK(construction_count == destruction_count);
construction_count = 0;
destruction_count = 0;
{
boost::function0<int> f;
boost::function0<int> g;
f = MyLargeFunctor();
g = MyLargeFunctor();
f.swap(g);
}
// MyLargeFunctor objects should be constructed as many times as
// they are destroyed.
BOOST_CHECK(construction_count == destruction_count);
}
int main()
{ {
test_zero_args(); test_zero_args();
test_one_arg(); test_one_arg();
@@ -700,6 +644,5 @@ int main()
test_emptiness(); test_emptiness();
test_member_functions(); test_member_functions();
test_ref(); test_ref();
test_construct_destroy_count(); return 0;
return boost::report_errors();
} }

View File

@@ -7,22 +7,15 @@
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
#if defined(__clang__) && defined(__has_warning) #include <boost/test/minimal.hpp>
# if __has_warning( "-Wself-assign-overloaded" )
# pragma clang diagnostic ignored "-Wself-assign-overloaded"
# endif
#endif
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
#include <functional> #include <functional>
#include <cassert>
#include <string> #include <string>
#include <utility> #include <utility>
#define BOOST_CHECK BOOST_TEST using namespace boost;
using namespace std;
using boost::function;
using std::string;
int global_int; int global_int;
@@ -63,30 +56,30 @@ test_zero_args()
// Default construction // Default construction
func_void_type v1; func_void_type v1;
BOOST_CHECK(v1.empty()); BOOST_TEST(v1.empty());
// Assignment to an empty function // Assignment to an empty function
v1 = five; v1 = five;
BOOST_CHECK(v1 != 0); BOOST_TEST(v1 != 0);
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v1.clear(); v1.clear();
BOOST_CHECK(v1 == 0); BOOST_TEST(v1 == 0);
// Assignment to an empty function // Assignment to an empty function
v1 = three; v1 = three;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation and self-assignment // Invocation and self-assignment
global_int = 0; global_int = 0;
v1 = v1; v1 = v1;
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v1 = five; v1 = five;
@@ -95,61 +88,61 @@ test_zero_args()
global_int = 0; global_int = 0;
v1 = (v1); v1 = (v1);
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear // clear
v1 = 0; v1 = 0;
BOOST_CHECK(0 == v1); BOOST_TEST(0 == v1);
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v1 = BOOST_FUNCTION_TARGET_FIX(&) write_five; v1 = BOOST_FUNCTION_TARGET_FIX(&) write_five;
BOOST_CHECK(0 != v1); BOOST_TEST(0 != v1);
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v1 = BOOST_FUNCTION_TARGET_FIX(&) write_three; v1 = BOOST_FUNCTION_TARGET_FIX(&) write_three;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v1 = five; v1 = five;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v1 = &write_three; v1 = &write_three;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Construction from another function (that is empty) // Construction from another function (that is empty)
v1.clear(); v1.clear();
func_void_type v2(v1); func_void_type v2(v1);
BOOST_CHECK(!v2? true : false); BOOST_TEST(!v2? true : false);
// Assignment to an empty function // Assignment to an empty function
v2 = three; v2 = three;
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v2 = (five); v2 = (five);
@@ -157,86 +150,86 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
v2.clear(); v2.clear();
BOOST_CHECK(v2.empty()); BOOST_TEST(v2.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v2 = (BOOST_FUNCTION_TARGET_FIX(&) write_five); v2 = (BOOST_FUNCTION_TARGET_FIX(&) write_five);
BOOST_CHECK(v2? true : false); BOOST_TEST(v2? true : false);
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v2 = BOOST_FUNCTION_TARGET_FIX(&) write_three; v2 = BOOST_FUNCTION_TARGET_FIX(&) write_three;
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Swapping // Swapping
v1 = five; v1 = five;
swap(v1, v2); swap(v1, v2);
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
swap(v1, v2); swap(v1, v2);
v1.clear(); v1.clear();
// Assignment // Assignment
v2 = five; v2 = five;
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v2 = &write_three; v2 = &write_three;
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a function from an empty function // Assignment to a function from an empty function
v2 = v1; v2 = v1;
BOOST_CHECK(v2.empty()); BOOST_TEST(v2.empty());
// Assignment to a function from a function with a functor // Assignment to a function from a function with a functor
v1 = three; v1 = three;
v2 = v1; v2 = v1;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assign to a function from a function with a function // Assign to a function from a function with a function
v2 = BOOST_FUNCTION_TARGET_FIX(&) write_five; v2 = BOOST_FUNCTION_TARGET_FIX(&) write_five;
v1 = v2; v1 = v2;
BOOST_CHECK(!v1.empty()); BOOST_TEST(!v1.empty());
BOOST_CHECK(!v2.empty()); BOOST_TEST(!v2.empty());
global_int = 0; global_int = 0;
v1(); v1();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
global_int = 0; global_int = 0;
v2(); v2();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Construct a function given another function containing a function // Construct a function given another function containing a function
func_void_type v3(v1); func_void_type v3(v1);
@@ -244,20 +237,20 @@ test_zero_args()
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v3.clear(); v3.clear();
BOOST_CHECK(!v3? true : false); BOOST_TEST(!v3? true : false);
// Assignment to an empty function // Assignment to an empty function
v3 = three; v3 = three;
BOOST_CHECK(!v3.empty()); BOOST_TEST(!v3.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v3 = five; v3 = five;
@@ -265,38 +258,38 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() // clear()
v3.clear(); v3.clear();
BOOST_CHECK(v3.empty()); BOOST_TEST(v3.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v3 = &write_five; v3 = &write_five;
BOOST_CHECK(!v3.empty()); BOOST_TEST(!v3.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v3 = &write_three; v3 = &write_three;
BOOST_CHECK(!v3.empty()); BOOST_TEST(!v3.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v3 = five; v3 = five;
BOOST_CHECK(!v3.empty()); BOOST_TEST(!v3.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v3(); v3();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Construction of a function from a function containing a functor // Construction of a function from a function containing a functor
func_void_type v4(v3); func_void_type v4(v3);
@@ -304,20 +297,20 @@ test_zero_args()
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v4.clear(); v4.clear();
BOOST_CHECK(v4.empty()); BOOST_TEST(v4.empty());
// Assignment to an empty function // Assignment to an empty function
v4 = three; v4 = three;
BOOST_CHECK(!v4.empty()); BOOST_TEST(!v4.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v4 = five; v4 = five;
@@ -325,38 +318,38 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() // clear()
v4.clear(); v4.clear();
BOOST_CHECK(v4.empty()); BOOST_TEST(v4.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v4 = &write_five; v4 = &write_five;
BOOST_CHECK(!v4.empty()); BOOST_TEST(!v4.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v4 = &write_three; v4 = &write_three;
BOOST_CHECK(!v4.empty()); BOOST_TEST(!v4.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v4 = five; v4 = five;
BOOST_CHECK(!v4.empty()); BOOST_TEST(!v4.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v4(); v4();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Construction of a function from a functor // Construction of a function from a functor
func_void_type v5(five); func_void_type v5(five);
@@ -364,20 +357,20 @@ test_zero_args()
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v5.clear(); v5.clear();
BOOST_CHECK(v5.empty()); BOOST_TEST(v5.empty());
// Assignment to an empty function // Assignment to an empty function
v5 = three; v5 = three;
BOOST_CHECK(!v5.empty()); BOOST_TEST(!v5.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v5 = five; v5 = five;
@@ -385,38 +378,38 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() // clear()
v5.clear(); v5.clear();
BOOST_CHECK(v5.empty()); BOOST_TEST(v5.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v5 = &write_five; v5 = &write_five;
BOOST_CHECK(!v5.empty()); BOOST_TEST(!v5.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v5 = &write_three; v5 = &write_three;
BOOST_CHECK(!v5.empty()); BOOST_TEST(!v5.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v5 = five; v5 = five;
BOOST_CHECK(!v5.empty()); BOOST_TEST(!v5.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v5(); v5();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Construction of a function from a function // Construction of a function from a function
func_void_type v6(&write_five); func_void_type v6(&write_five);
@@ -424,20 +417,20 @@ test_zero_args()
// Invocation of a function // Invocation of a function
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() method // clear() method
v6.clear(); v6.clear();
BOOST_CHECK(v6.empty()); BOOST_TEST(v6.empty());
// Assignment to an empty function // Assignment to an empty function
v6 = three; v6 = three;
BOOST_CHECK(!v6.empty()); BOOST_TEST(!v6.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment to a non-empty function // Assignment to a non-empty function
v6 = five; v6 = five;
@@ -445,38 +438,38 @@ test_zero_args()
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// clear() // clear()
v6.clear(); v6.clear();
BOOST_CHECK(v6.empty()); BOOST_TEST(v6.empty());
// Assignment to an empty function from a free function // Assignment to an empty function from a free function
v6 = &write_five; v6 = &write_five;
BOOST_CHECK(!v6.empty()); BOOST_TEST(!v6.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Assignment to a non-empty function from a free function // Assignment to a non-empty function from a free function
v6 = &write_three; v6 = &write_three;
BOOST_CHECK(!v6.empty()); BOOST_TEST(!v6.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 3); BOOST_TEST(global_int == 3);
// Assignment // Assignment
v6 = five; v6 = five;
BOOST_CHECK(!v6.empty()); BOOST_TEST(!v6.empty());
// Invocation // Invocation
global_int = 0; global_int = 0;
v6(); v6();
BOOST_CHECK(global_int == 5); BOOST_TEST(global_int == 5);
// Const vs. non-const // Const vs. non-const
write_const_1_nonconst_2 one_or_two; write_const_1_nonconst_2 one_or_two;
@@ -485,16 +478,16 @@ test_zero_args()
global_int = 0; global_int = 0;
v7(); v7();
BOOST_CHECK(global_int == 2); BOOST_TEST(global_int == 2);
global_int = 0; global_int = 0;
v8(); v8();
BOOST_CHECK(global_int == 2); BOOST_TEST(global_int == 2);
// Test construction from 0 and comparison to 0 // Test construction from 0 and comparison to 0
func_void_type v9(0); func_void_type v9(0);
BOOST_CHECK(v9 == 0); BOOST_TEST(v9 == 0);
BOOST_CHECK(0 == v9); BOOST_TEST(0 == v9);
// Test return values // Test return values
typedef function<int ()> func_int_type; typedef function<int ()> func_int_type;
@@ -503,78 +496,78 @@ test_zero_args()
func_int_type i0(gen_five); func_int_type i0(gen_five);
BOOST_CHECK(i0() == 5); BOOST_TEST(i0() == 5);
i0 = gen_three; i0 = gen_three;
BOOST_CHECK(i0() == 3); BOOST_TEST(i0() == 3);
i0 = &generate_five; i0 = &generate_five;
BOOST_CHECK(i0() == 5); BOOST_TEST(i0() == 5);
i0 = &generate_three; i0 = &generate_three;
BOOST_CHECK(i0() == 3); BOOST_TEST(i0() == 3);
BOOST_CHECK(i0? true : false); BOOST_TEST(i0? true : false);
i0.clear(); i0.clear();
BOOST_CHECK(!i0? true : false); BOOST_TEST(!i0? true : false);
// Test return values with compatible types // Test return values with compatible types
typedef function<long ()> func_long_type; typedef function<long ()> func_long_type;
func_long_type i1(gen_five); func_long_type i1(gen_five);
BOOST_CHECK(i1() == 5); BOOST_TEST(i1() == 5);
i1 = gen_three; i1 = gen_three;
BOOST_CHECK(i1() == 3); BOOST_TEST(i1() == 3);
i1 = &generate_five; i1 = &generate_five;
BOOST_CHECK(i1() == 5); BOOST_TEST(i1() == 5);
i1 = &generate_three; i1 = &generate_three;
BOOST_CHECK(i1() == 3); BOOST_TEST(i1() == 3);
BOOST_CHECK(i1? true : false); BOOST_TEST(i1? true : false);
i1.clear(); i1.clear();
BOOST_CHECK(!i1? true : false); BOOST_TEST(!i1? true : false);
} }
static void static void
test_one_arg() test_one_arg()
{ {
std::negate<int> neg; negate<int> neg;
function<int (int)> f1(neg); function<int (int)> f1(neg);
BOOST_CHECK(f1(5) == -5); BOOST_TEST(f1(5) == -5);
function<string (string)> id(&identity_str); function<string (string)> id(&identity_str);
BOOST_CHECK(id("str") == "str"); BOOST_TEST(id("str") == "str");
function<string (const char*)> id2(&identity_str); function<string (const char*)> id2(&identity_str);
BOOST_CHECK(id2("foo") == "foo"); BOOST_TEST(id2("foo") == "foo");
add_to_obj add_to(5); add_to_obj add_to(5);
function<int (int)> f2(add_to); function<int (int)> f2(add_to);
BOOST_CHECK(f2(3) == 8); BOOST_TEST(f2(3) == 8);
const function<int (int)> cf2(add_to); const function<int (int)> cf2(add_to);
BOOST_CHECK(cf2(3) == 8); BOOST_TEST(cf2(3) == 8);
} }
static void static void
test_two_args() test_two_args()
{ {
function<string (const string&, const string&)> cat(&string_cat); function<string (const string&, const string&)> cat(&string_cat);
BOOST_CHECK(cat("str", "ing") == "string"); BOOST_TEST(cat("str", "ing") == "string");
function<int (short, short)> sum(&sum_ints); function<int (short, short)> sum(&sum_ints);
BOOST_CHECK(sum(2, 3) == 5); BOOST_TEST(sum(2, 3) == 5);
} }
static void static void
test_emptiness() test_emptiness()
{ {
function<float ()> f1; function<float ()> f1;
BOOST_CHECK(f1.empty()); BOOST_TEST(f1.empty());
function<float ()> f2; function<float ()> f2;
f2 = f1; f2 = f1;
BOOST_CHECK(f2.empty()); BOOST_TEST(f2.empty());
function<double ()> f3; function<double ()> f3;
f3 = f2; f3 = f2;
BOOST_CHECK(f3.empty()); BOOST_TEST(f3.empty());
} }
struct X { struct X {
@@ -594,18 +587,18 @@ test_member_functions()
X one(1); X one(1);
X five(5); X five(5);
BOOST_CHECK(f1(&one) == 2); BOOST_TEST(f1(&one) == 2);
BOOST_CHECK(f1(&five) == 10); BOOST_TEST(f1(&five) == 10);
boost::function<int (X*)> f1_2; boost::function<int (X*)> f1_2;
f1_2 = &X::twice; f1_2 = &X::twice;
BOOST_CHECK(f1_2(&one) == 2); BOOST_TEST(f1_2(&one) == 2);
BOOST_CHECK(f1_2(&five) == 10); BOOST_TEST(f1_2(&five) == 10);
boost::function<int (X&, int)> f2(&X::plus); boost::function<int (X&, int)> f2(&X::plus);
BOOST_CHECK(f2(one, 3) == 4); BOOST_TEST(f2(one, 3) == 4);
BOOST_CHECK(f2(five, 4) == 9); BOOST_TEST(f2(five, 4) == 9);
} }
struct add_with_throw_on_copy { struct add_with_throw_on_copy {
@@ -615,12 +608,12 @@ struct add_with_throw_on_copy {
add_with_throw_on_copy(const add_with_throw_on_copy&) add_with_throw_on_copy(const add_with_throw_on_copy&)
{ {
throw std::runtime_error("But this CAN'T throw"); throw runtime_error("But this CAN'T throw");
} }
add_with_throw_on_copy& operator=(const add_with_throw_on_copy&) add_with_throw_on_copy& operator=(const add_with_throw_on_copy&)
{ {
throw std::runtime_error("But this CAN'T throw"); throw runtime_error("But this CAN'T throw");
} }
}; };
@@ -629,59 +622,86 @@ test_ref()
{ {
add_with_throw_on_copy atc; add_with_throw_on_copy atc;
try { try {
boost::function<int (int, int)> f(boost::ref(atc)); boost::function<int (int, int)> f(ref(atc));
BOOST_CHECK(f(1, 3) == 4); BOOST_TEST(f(1, 3) == 4);
} }
catch(std::runtime_error const&) { catch(runtime_error e) {
BOOST_ERROR("Nonthrowing constructor threw an exception"); BOOST_ERROR("Nonthrowing constructor threw an exception");
} }
} }
#if BOOST_WORKAROUND(BOOST_GCC, >= 70000 && BOOST_GCC < 80000) && __cplusplus >= 201700 static int alloc_count = 0;
static int dealloc_count = 0;
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81311 template<typename T>
#pragma message("Skipping test_empty_ref on g++ 7 -std=c++17") struct counting_allocator : public allocator<T>
static void test_empty_ref()
{ {
} template<typename U>
struct rebind
#else
static void dummy() {}
static void test_empty_ref()
{ {
boost::function<void()> f1; typedef counting_allocator<U> other;
boost::function<void()> f2(boost::ref(f1)); };
try {
f2();
BOOST_ERROR("Exception didn't throw for reference to empty function.");
}
catch(std::runtime_error const&) {}
f1 = dummy; T* allocate(size_t n)
{
try { alloc_count++;
f2(); return allocator<T>::allocate(n);
}
catch(std::runtime_error const&) {
BOOST_ERROR("Error calling referenced function.");
}
} }
#endif void deallocate(T* p, size_t n)
{
dealloc_count++;
allocator<T>::deallocate(p, n);
}
};
static int do_minus(int x, int y) { return x-y; }
struct DoNothing
{
void operator()() const {}
};
static void do_nothing() {}
static void test_allocator()
{
#ifndef BOOST_NO_STD_ALLOCATOR
boost::function<int (int, int), counting_allocator<int> > f;
f = plus<int>();
f.clear();
BOOST_TEST(alloc_count == 1);
BOOST_TEST(dealloc_count == 1);
alloc_count = 0;
dealloc_count = 0;
f = &do_minus;
f.clear();
boost::function<void (), counting_allocator<int> > fv;
alloc_count = 0;
dealloc_count = 0;
fv = DoNothing();
fv.clear();
BOOST_TEST(alloc_count == 1);
BOOST_TEST(dealloc_count == 1);
alloc_count = 0;
dealloc_count = 0;
fv = &do_nothing;
fv.clear();
#endif // ndef BOOST_NO_STD_ALLOCATOR
}
static void test_exception() static void test_exception()
{ {
boost::function<int (int, int)> f; boost::function<int (int, int)> f;
try { try {
f(5, 4); f(5, 4);
BOOST_CHECK(false); BOOST_TEST(false);
} }
catch(boost::bad_function_call const&) { catch(boost::bad_function_call) {
// okay // okay
} }
} }
@@ -697,12 +717,12 @@ static void test_implicit()
static void test_call_obj(boost::function<int (int, int)> f) static void test_call_obj(boost::function<int (int, int)> f)
{ {
BOOST_CHECK(!f.empty()); assert(!f.empty());
} }
static void test_call_cref(const boost::function<int (int, int)>& f) static void test_call_cref(const boost::function<int (int, int)>& f)
{ {
BOOST_CHECK(!f.empty()); assert(!f.empty());
} }
static void test_call() static void test_call()
@@ -711,96 +731,7 @@ static void test_call()
test_call_cref(std::plus<int>()); test_call_cref(std::plus<int>());
} }
struct big_aggregating_structure { int test_main(int, char* [])
int disable_small_objects_optimizations[32];
big_aggregating_structure()
{
++ global_int;
}
big_aggregating_structure(const big_aggregating_structure&)
{
++ global_int;
}
~big_aggregating_structure()
{
-- global_int;
}
void operator()()
{
++ global_int;
}
void operator()(int)
{
++ global_int;
}
};
template <class FunctionT>
static void test_move_semantics()
{
typedef FunctionT f1_type;
big_aggregating_structure obj;
f1_type f1 = obj;
global_int = 0;
f1();
BOOST_CHECK(!f1.empty());
BOOST_CHECK(global_int == 1);
#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
// Testing rvalue constructors
f1_type f2(static_cast<f1_type&&>(f1));
BOOST_CHECK(f1.empty());
BOOST_CHECK(!f2.empty());
BOOST_CHECK(global_int == 1);
f2();
BOOST_CHECK(global_int == 2);
f1_type f3(static_cast<f1_type&&>(f2));
BOOST_CHECK(f1.empty());
BOOST_CHECK(f2.empty());
BOOST_CHECK(!f3.empty());
BOOST_CHECK(global_int == 2);
f3();
BOOST_CHECK(global_int == 3);
// Testing move assignment
f1_type f4;
BOOST_CHECK(f4.empty());
f4 = static_cast<f1_type&&>(f3);
BOOST_CHECK(f1.empty());
BOOST_CHECK(f2.empty());
BOOST_CHECK(f3.empty());
BOOST_CHECK(!f4.empty());
BOOST_CHECK(global_int == 3);
f4();
BOOST_CHECK(global_int == 4);
// Testing self move assignment
f4 = static_cast<f1_type&&>(f4);
BOOST_CHECK(!f4.empty());
BOOST_CHECK(global_int == 4);
// Testing, that no memory leaked when assigning to nonempty function
f4 = obj;
BOOST_CHECK(!f4.empty());
BOOST_CHECK(global_int == 4);
f1_type f5 = obj;
BOOST_CHECK(global_int == 5);
f4 = static_cast<f1_type&&>(f5);
BOOST_CHECK(global_int == 4);
#endif
}
int main()
{ {
test_zero_args(); test_zero_args();
test_one_arg(); test_one_arg();
@@ -808,12 +739,10 @@ int main()
test_emptiness(); test_emptiness();
test_member_functions(); test_member_functions();
test_ref(); test_ref();
test_empty_ref(); test_allocator();
test_exception(); test_exception();
test_implicit(); test_implicit();
test_call(); test_call();
test_move_semantics<function<void()> >();
test_move_semantics<boost::function0<void> >();
return boost::report_errors(); return 0;
} }

View File

@@ -1,18 +1,28 @@
// Boost.Function library // Boost.Function library
// Copyright (C) Douglas Gregor 2001-2005. Use, modification and // Copyright Douglas Gregor 2001-2003. Use, modification and
// distribution is subject to the Boost Software License, Version // distribution is subject to the Boost Software License, Version
// 1.0. (See accompanying file LICENSE_1_0.txt or copy at // 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
#include <boost/test/minimal.hpp>
#include <boost/function.hpp> #include <boost/function.hpp>
void test() using namespace std;
{ using namespace boost;
boost::function0<int> f1;
boost::function0<int> f2;
if( f1 == f2 ) {} int
test_main(int, char*[])
{
function0<int> f1;
function0<int> f2;
if (f1 == f2) {
}
BOOST_CRITICAL_ERROR("This should not have compiled.");
return 0;
} }

View File

@@ -1,18 +1,27 @@
// Boost.Function library // Boost.Function library
// Copyright (C) Douglas Gregor 2001-2005. Use, modification and // Copyright Douglas Gregor 2001-2003. Use, modification and
// distribution is subject to the Boost Software License, Version // distribution is subject to the Boost Software License, Version
// 1.0. (See accompanying file LICENSE_1_0.txt or copy at // 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
#include <boost/test/minimal.hpp>
#include <boost/function.hpp> #include <boost/function.hpp>
using namespace std;
using namespace boost;
static int bad_fn(float f) { return static_cast<int>(f); } static int bad_fn(float f) { return static_cast<int>(f); }
void test() int
test_main(int, char*[])
{ {
boost::function0<int> f1; function0<int> f1;
f1 = bad_fn; f1 = bad_fn;
BOOST_CRITICAL_ERROR("This should not have compiled.");
return 0;
} }

View File

@@ -1,18 +0,0 @@
// Boost.Function library
// Copyright Douglas Gregor 2008. Use, modification and
// distribution is 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)
// For more information, see http://www.boost.org
#include <boost/function/function_typeof.hpp>
#include <boost/function.hpp>
#include <boost/typeof/typeof.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/static_assert.hpp>
void f(boost::function0<void> f, boost::function0<void> g)
{
BOOST_STATIC_ASSERT((boost::is_same<boost::function0<void>, BOOST_TYPEOF(f = g)>::value));
}

View File

@@ -1,21 +0,0 @@
// Copyright 2022 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0.
// https://www.boost.org/LICENSE_1_0.txt
//
// https://github.com/boostorg/function/issues/42
#include <boost/function.hpp>
struct F
{
int operator()( int x ) const { return -x; }
};
struct X
{
boost::function<int(int)> f_;
explicit X( boost::function<int(int)> f ): f_( f ) {}
};
F f2;
X x( f2 ); // -Wuninitialized under GCC 12

View File

@@ -7,34 +7,32 @@
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
#include <boost/function.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
#include <boost/core/lightweight_test.hpp>
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <boost/test/minimal.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
#include <boost/function.hpp>
using namespace std;
using namespace boost;
using namespace boost::lambda;
static unsigned static unsigned
func_impl(int arg1, bool arg2, double arg3) func_impl(int arg1, bool arg2, double arg3)
{ {
using namespace std;
return abs (static_cast<int>((arg2 ? arg1 : 2 * arg1) * arg3)); return abs (static_cast<int>((arg2 ? arg1 : 2 * arg1) * arg3));
} }
int main() int test_main(int, char*[])
{ {
using boost::function;
using namespace boost::lambda;
function <unsigned(bool, double)> f1 = bind(func_impl, 15, _1, _2); function <unsigned(bool, double)> f1 = bind(func_impl, 15, _1, _2);
BOOST_TEST_EQ( f1(true, 2.0), 30u ); function <unsigned(double)> f2 = bind(f1, false, _1);
function <unsigned()> f3 = bind(f2, 4.0);
function <unsigned(double)> f2 = boost::lambda::bind(f1, false, _1); f3();
BOOST_TEST_EQ( f2(2.0), 60u );
function <unsigned()> f3 = boost::lambda::bind(f2, 4.0); return 0;
BOOST_TEST_EQ( f3(), 120u );
return boost::report_errors();
} }

View File

@@ -10,36 +10,22 @@
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
#include <iostream> #include <iostream>
#include <functional> #include <functional>
struct Y {
Y(int y = 0) : y_(y) {}
bool operator==(const Y& rhs) const { return y_ == rhs.y_; }
private:
int y_;
};
struct X { struct X {
int foo(int); int foo(int);
Y& foo2(Y&) const;
}; };
int X::foo(int x) { return -x; } int X::foo(int x) { return -x; }
Y& X::foo2(Y& x) const { return x; }
int main() int main()
{ {
boost::function<int (X*, int)> f; boost::function<int (X*, int)> f;
boost::function<Y& (X*, Y&)> f2;
Y y1;
f = &X::foo; f = &X::foo;
f2 = &X::foo2;
X x; X x;
BOOST_TEST(f(&x, 5) == -5); f(&x, 5);
BOOST_TEST(f2(&x, boost::ref(y1)) == y1);
return ::boost::report_errors(); return 0;
} }

View File

@@ -10,36 +10,22 @@
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
#include <iostream> #include <iostream>
#include <functional> #include <functional>
struct Y {
Y(int y = 0) : y_(y) {}
bool operator==(const Y& rhs) const { return y_ == rhs.y_; }
private:
int y_;
};
struct X { struct X {
int foo(int); int foo(int);
Y& foo2(Y&) const;
}; };
int X::foo(int x) { return -x; } int X::foo(int x) { return -x; }
Y& X::foo2(Y& x) const { return x; }
int main() int main()
{ {
boost::function2<int, X*, int> f; boost::function2<int, X*, int> f;
boost::function2<Y&, X*, Y&> f2;
Y y1;
f = &X::foo; f = &X::foo;
f2 = &X::foo2;
X x; X x;
BOOST_TEST(f(&x, 5) == -5); f(&x, 5);
BOOST_TEST(f2(&x, boost::ref(y1)) == y1);
return ::boost::report_errors(); return 0;
} }

View File

@@ -1,42 +0,0 @@
// Copyright 2018 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0.
#include <boost/function.hpp>
#include <boost/config.hpp>
#if defined(MIXED_CXXSTD_DYN_LINK)
# define EXPORT BOOST_SYMBOL_EXPORT
#else
# define EXPORT
#endif
EXPORT void call_fn_1( boost::function<void()> const & fn )
{
fn();
}
EXPORT void call_fn_2( boost::function<void(int)> const & fn )
{
fn( 1 );
}
EXPORT void call_fn_3( boost::function<void(int, int)> const & fn )
{
fn( 1, 2 );
}
EXPORT void call_fn_4( boost::function0<void> const & fn )
{
fn();
}
EXPORT void call_fn_5( boost::function1<void, int> const & fn )
{
fn( 1 );
}
EXPORT void call_fn_6( boost::function2<void, int, int> const & fn )
{
fn( 1, 2 );
}

View File

@@ -1,62 +0,0 @@
// Boost.Function library
// Copyright Douglas Gregor 2008. Use, modification and
// distribution is 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)
// For more information, see http://www.boost.org
#include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
#define BOOST_CHECK BOOST_TEST
struct tried_to_copy { };
struct MaybeThrowOnCopy {
MaybeThrowOnCopy(int value = 0) : value(value) { }
MaybeThrowOnCopy(const MaybeThrowOnCopy& other) : value(other.value) {
if (throwOnCopy)
throw tried_to_copy();
}
MaybeThrowOnCopy& operator=(const MaybeThrowOnCopy& other) {
if (throwOnCopy)
throw tried_to_copy();
value = other.value;
return *this;
}
int operator()() { return value; }
int value;
// Make sure that this function object doesn't trigger the
// small-object optimization in Function.
float padding[100];
static bool throwOnCopy;
};
bool MaybeThrowOnCopy::throwOnCopy = false;
int main()
{
boost::function0<int> f;
boost::function0<int> g;
MaybeThrowOnCopy::throwOnCopy = false;
f = MaybeThrowOnCopy(1);
g = MaybeThrowOnCopy(2);
BOOST_CHECK(f() == 1);
BOOST_CHECK(g() == 2);
MaybeThrowOnCopy::throwOnCopy = true;
f.swap(g);
BOOST_CHECK(f() == 2);
BOOST_CHECK(g() == 1);
return boost::report_errors();
}

View File

@@ -1,21 +0,0 @@
// Copyright 2019 Peter Dimov
// Use, modification and distribution is 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
#include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
static int f( int x )
{
return x + 1;
}
int main()
{
boost::function<int(int)> fn( f );
BOOST_TEST_EQ( fn( 5 ), 6 );
return boost::report_errors();
}

View File

@@ -1,39 +0,0 @@
// Boost.Function library
// Copyright 2016 Peter Dimov
// Use, modification and distribution is 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)
#include <boost/function.hpp>
#include <boost/core/lightweight_test_trait.hpp>
struct X
{
};
struct Y
{
};
struct Z
{
};
int main()
{
typedef boost::function<X(Y)> F1;
BOOST_TEST_TRAIT_SAME(F1::result_type, X);
BOOST_TEST_TRAIT_SAME(F1::argument_type, Y);
typedef boost::function<X(Y, Z)> F2;
BOOST_TEST_TRAIT_SAME(F2::result_type, X);
BOOST_TEST_TRAIT_SAME(F2::first_argument_type, Y);
BOOST_TEST_TRAIT_SAME(F2::second_argument_type, Z);
return boost::report_errors();
}

View File

@@ -1,27 +0,0 @@
// Copyright 2018 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0.
#include <boost/function.hpp>
#include <boost/config.hpp>
#if defined(RETURN_FUNCTION_DYN_LINK)
# define EXPORT BOOST_SYMBOL_EXPORT
#else
# define EXPORT
#endif
int f( int x, int y )
{
return x + y;
}
EXPORT boost::function<int(int, int)> get_fn_1()
{
return f;
}
EXPORT boost::function2<int, int, int> get_fn_2()
{
return f;
}

View File

@@ -1,107 +0,0 @@
// Copyright 2014 Antony Polukhin.
//
// 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)
// For more information, see http://www.boost.org
#include <boost/function.hpp>
#include <boost/move/move.hpp>
#include <boost/core/lightweight_test.hpp>
#include <iostream>
#include <cstdlib>
#define BOOST_CHECK BOOST_TEST
class only_movable {
private:
BOOST_MOVABLE_BUT_NOT_COPYABLE(only_movable)
int value_;
bool moved_;
public:
only_movable(BOOST_RV_REF(only_movable) x)
: value_(x.value_)
, moved_(false)
{
x.moved_ = true;
}
only_movable& operator=(BOOST_RV_REF(only_movable) x) {
value_ = x.value_;
x.moved_ = true;
moved_ = false;
return *this;
}
explicit only_movable(int value = 0) : value_(value), moved_(false) {}
int get_value() const { return value_; }
bool is_moved() const { return moved_; }
};
int one(BOOST_RV_REF(only_movable) v) { return v.get_value(); }
only_movable two(BOOST_RV_REF(only_movable) t) {
only_movable t1 = boost::move(t);
return BOOST_MOVE_RET(only_movable, t1);
}
only_movable two_sum(BOOST_RV_REF(only_movable) t1, BOOST_RV_REF(only_movable) t2) {
only_movable ret(t1.get_value() + t2.get_value());
return BOOST_MOVE_RET(only_movable, ret);
}
struct sum_struct {
only_movable operator()(BOOST_RV_REF(only_movable) t1, BOOST_RV_REF(only_movable) t2) const {
only_movable ret(t1.get_value() + t2.get_value());
return BOOST_MOVE_RET(only_movable, ret);
}
};
#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
int three(std::string&&) { return 1; }
std::string&& four(std::string&& s) { return boost::move(s); }
#endif
int main()
{
using boost::function;
function <int(BOOST_RV_REF(only_movable))> f1 = one;
only_movable om1(1);
BOOST_CHECK(f1(boost::move(om1)) == 1);
function <only_movable(BOOST_RV_REF(only_movable))> f2 = two;
only_movable om2(2);
only_movable om2_2 = f2(boost::move(om2));
BOOST_CHECK(om2_2.get_value() == 2);
BOOST_CHECK(om2.is_moved());
{
function <only_movable(BOOST_RV_REF(only_movable), BOOST_RV_REF(only_movable))> f2_sum = two_sum;
only_movable om1_sum(1), om2_sum(2);
only_movable om2_sum_2 = f2_sum(boost::move(om1_sum), boost::move(om2_sum));
BOOST_CHECK(om2_sum_2.get_value() == 3);
}
{
sum_struct s;
function <only_movable(BOOST_RV_REF(only_movable), BOOST_RV_REF(only_movable))> f2_sum = s;
only_movable om1_sum(1), om2_sum(2);
only_movable om2_sum_2 = f2_sum(boost::move(om1_sum), boost::move(om2_sum));
BOOST_CHECK(om2_sum_2.get_value() == 3);
}
#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
function <int(std::string&&)> f3 = three;
function <std::string&& (std::string&& s)> f4 = four;
f3(std::string("Hello"));
BOOST_CHECK(f4(std::string("world")) == "world");
#endif
return boost::report_errors();
}

View File

@@ -7,36 +7,34 @@
// For more information, see http://www.boost.org // For more information, see http://www.boost.org
#include <boost/test/minimal.hpp>
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
#include <stdexcept> #include <stdexcept>
#include <new>
struct stateless_integer_add { struct stateless_integer_add {
int operator()(int x, int y) const { return x+y; } int operator()(int x, int y) const { return x+y; }
void* operator new(std::size_t n) void* operator new(std::size_t, stateless_integer_add*)
{ {
BOOST_ERROR( "stateless_integer_add incorrectly allocated" ); throw std::runtime_error("Cannot allocate a stateless_integer_add");
return ::operator new( n );
} }
void* operator new(std::size_t, void* p) void operator delete(void*, stateless_integer_add*) throw()
{ {
return p;
}
void operator delete(void* p) throw()
{
BOOST_ERROR( "stateless_integer_add incorrectly deallocated" );
return ::operator delete( p );
} }
}; };
int main() namespace boost {
template<>
struct is_stateless<stateless_integer_add> {
BOOST_STATIC_CONSTANT(bool, value = true);
};
}
int test_main(int, char*[])
{ {
boost::function2<int, int, int> f; boost::function2<int, int, int> f;
f = stateless_integer_add(); f = stateless_integer_add();
return boost::report_errors(); return 0;
} }

View File

@@ -8,15 +8,6 @@
// For more information, see http://www.boost.org/ // For more information, see http://www.boost.org/
#if defined(__clang__) && defined(__has_warning)
# if __has_warning( "-Wdeprecated-declarations" )
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
# endif
#endif
#if defined(__GNUC__) && __GNUC__ >= 12
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
#include <boost/function.hpp> #include <boost/function.hpp>
#include <iostream> #include <iostream>
@@ -29,12 +20,11 @@ int X::foo(int x) { return -x; }
int main() int main()
{ {
#ifndef BOOST_NO_CXX98_BINDERS
boost::function<int (int)> f; boost::function<int (int)> f;
X x; X x;
f = std::bind1st( f = std::bind1st(
std::mem_fun(&X::foo), &x); std::mem_fun(&X::foo), &x);
f(5); // Call x.foo(5) f(5); // Call x.foo(5)
#endif
return 0; return 0;
} }

View File

@@ -8,15 +8,6 @@
// For more information, see http://www.boost.org/ // For more information, see http://www.boost.org/
#if defined(__clang__) && defined(__has_warning)
# if __has_warning( "-Wdeprecated-declarations" )
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
# endif
#endif
#if defined(__GNUC__) && __GNUC__ >= 12
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
#include <boost/function.hpp> #include <boost/function.hpp>
#include <iostream> #include <iostream>
@@ -29,12 +20,11 @@ int X::foo(int x) { return -x; }
int main() int main()
{ {
#ifndef BOOST_NO_CXX98_BINDERS
boost::function1<int, int> f; boost::function1<int, int> f;
X x; X x;
f = std::bind1st( f = std::bind1st(
std::mem_fun(&X::foo), &x); std::mem_fun(&X::foo), &x);
f(5); // Call x.foo(5) f(5); // Call x.foo(5)
#endif
return 0; return 0;
} }

View File

@@ -1,14 +0,0 @@
// Copyright 2018 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0.
#include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
void throw_bad_function_call();
int main()
{
BOOST_TEST_THROWS( throw_bad_function_call(), boost::bad_function_call );
return boost::report_errors();
}

View File

@@ -1,48 +0,0 @@
// Copyright 2018 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0.
#include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
//
void call_fn_1( boost::function<void()> const & fn );
void call_fn_2( boost::function<void(int)> const & fn );
void call_fn_3( boost::function<void(int, int)> const & fn );
void call_fn_4( boost::function0<void> const & fn );
void call_fn_5( boost::function1<void, int> const & fn );
void call_fn_6( boost::function2<void, int, int> const & fn );
//
static int v;
void f0()
{
v = -1;
}
void f1( int x )
{
v = x;
}
void f2( int x, int y )
{
v = x + y;
}
int main()
{
v = 0; call_fn_1( f0 ); BOOST_TEST_EQ( v, -1 );
v = 0; call_fn_2( f1 ); BOOST_TEST_EQ( v, 1 );
v = 0; call_fn_3( f2 ); BOOST_TEST_EQ( v, 3 );
v = 0; call_fn_4( f0 ); BOOST_TEST_EQ( v, -1 );
v = 0; call_fn_5( f1 ); BOOST_TEST_EQ( v, 1 );
v = 0; call_fn_6( f2 ); BOOST_TEST_EQ( v, 3 );
return boost::report_errors();
}

View File

@@ -1,21 +0,0 @@
// Copyright 2018 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0.
#include <boost/function.hpp>
#include <boost/core/lightweight_test.hpp>
//
boost::function<int(int, int)> get_fn_1();
boost::function2<int, int, int> get_fn_2();
//
int main()
{
BOOST_TEST_EQ( get_fn_1()( 1, 2 ), 3 );
BOOST_TEST_EQ( get_fn_2()( 1, 2 ), 3 );
return boost::report_errors();
}

View File

@@ -1,17 +0,0 @@
// Copyright 2018 Peter Dimov.
// Distributed under the Boost Software License, Version 1.0.
#include <boost/function.hpp>
#include <boost/config.hpp>
#if defined(THROW_BAD_FUNCTION_CALL_DYN_LINK)
# define EXPORT BOOST_SYMBOL_EXPORT
#else
# define EXPORT
#endif
EXPORT void throw_bad_function_call()
{
throw boost::bad_function_call();
}