boostorg/functional
1
0
Fork 1
mirror of https://github.com/boostorg/functional.git synced 2025-07-31 04:57:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Glen Fernandes
2019-08-29 04:04:25 -04:00
parent c7433cbaec ec67130557
commit 319df75a32
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -120,6 +120,16 @@ matrix:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux
compiler: g++-9
env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17,2a
addons:
apt:
packages:
- g++-9
sources:
- ubuntu-toolchain-r-test
- os: linux - os: linux
compiler: clang++ compiler: clang++
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11 env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
@ -244,7 +254,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-8 compiler: clang++-8
env: TOOLSET=clang COMPILER=clang++-8 STANDARD=03,11,14,17,2a env: TOOLSET=clang COMPILER=clang++-8 CXXSTD=03,11,14,17,2a
addons: addons:
apt: apt:
packages: packages:

8
include/boost/functional/factory.hpp
View File

@ -10,10 +10,10 @@ Distributed under the Boost Software License, Version 1.0.
#ifndef BOOST_FUNCTIONAL_FACTORY_HPP #ifndef BOOST_FUNCTIONAL_FACTORY_HPP
#define BOOST_FUNCTIONAL_FACTORY_HPP #define BOOST_FUNCTIONAL_FACTORY_HPP
#include <boost/config.hpp>
#include <boost/core/empty_value.hpp> #include <boost/core/empty_value.hpp>
#include <boost/core/pointer_traits.hpp> #include <boost/core/pointer_traits.hpp>
#include <boost/type_traits/remove_cv.hpp> #include <boost/type_traits/remove_cv.hpp>
#include <boost/config.hpp>
#if !defined(BOOST_NO_CXX11_ALLOCATOR) #if !defined(BOOST_NO_CXX11_ALLOCATOR)
#include <memory> #include <memory>
#endif #endif
@ -141,15 +141,15 @@ public:
private: private:
typedef typename fc_pointer<A>::type pointer; typedef typename fc_pointer<A>::type pointer;
fc_allocate(const fc_allocate&);
fc_allocate& operator=(const fc_allocate&);
pointer release() BOOST_NOEXCEPT { pointer release() BOOST_NOEXCEPT {
pointer p = p_; pointer p = p_;
p_ = pointer(); p_ = pointer();
return p; return p;
} }
fc_allocate(const fc_allocate&);
fc_allocate& operator=(const fc_allocate&);
A a_; A a_;
pointer p_; pointer p_;
}; };