Merge branch 'develop'

This commit is contained in:
Peter Dimov
2021-05-28 00:23:59 +03:00
3 changed files with 13 additions and 6 deletions

View File

@ -15,10 +15,13 @@ environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-9.0
ADDRMD: 32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-10.0
ADDRMD: 32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-11.0
ADDRMD: 32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-12.0
ADDRMD: 32,64
@ -44,7 +47,7 @@ install:
- git submodule update --init libs/config
- git submodule update --init tools/boostdep
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\functional\
- python tools/boostdep/depinst/depinst.py functional
- python tools/boostdep/depinst/depinst.py -I forward/test -I factory/test -I overloaded_function/test functional
- cmd /c bootstrap
- b2 headers

View File

@ -285,7 +285,7 @@ install:
- git submodule update --init tools/boostdep
- mkdir -p libs/functional
- cp -r $TRAVIS_BUILD_DIR/* libs/functional
- python tools/boostdep/depinst/depinst.py functional
- python tools/boostdep/depinst/depinst.py -I forward/test -I factory/test -I overloaded_function/test functional
- ./bootstrap.sh
- ./b2 headers

View File

@ -9,7 +9,8 @@
"description": "The Boost.Function library contains a family of class templates that are function object wrappers.",
"category": [
"Function-objects"
]
],
"cxxstd": "03"
},
{
"key": "functional/factory",
@ -27,7 +28,8 @@
"documentation": "factory/",
"category": [
"Function-objects"
]
],
"cxxstd": "03"
},
{
"key": "functional/forward",
@ -43,7 +45,8 @@
"documentation": "forward/",
"category": [
"Function-objects"
]
],
"cxxstd": "03"
},
{
"key": "functional/overloaded_function",
@ -59,6 +62,7 @@
"documentation": "overloaded_function/",
"category": [
"Function-objects"
]
],
"cxxstd": "03"
}
]