forked from boostorg/utility
Merge pull request #5 from Lastique/patch-1
Fix compilation with gcc 4.5 in C++11 mode
This commit is contained in:
@ -22,19 +22,19 @@ namespace noncopyable_ // protection from unintended ADL
|
|||||||
{
|
{
|
||||||
class noncopyable
|
class noncopyable
|
||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
#ifndef BOOST_NO_DEFAULTED_FUNCTIONS
|
#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS)
|
||||||
BOOST_CONSTEXPR noncopyable() = default;
|
BOOST_CONSTEXPR noncopyable() = default;
|
||||||
~noncopyable() = default;
|
~noncopyable() = default;
|
||||||
#else
|
#else
|
||||||
noncopyable() {}
|
noncopyable() {}
|
||||||
~noncopyable() {}
|
~noncopyable() {}
|
||||||
#endif
|
#endif
|
||||||
#ifndef BOOST_NO_DELETED_FUNCTIONS
|
#if !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
|
||||||
noncopyable( const noncopyable& ) = delete;
|
noncopyable( const noncopyable& ) = delete;
|
||||||
noncopyable& operator=( const noncopyable& ) = delete;
|
noncopyable& operator=( const noncopyable& ) = delete;
|
||||||
#else
|
#else
|
||||||
private: // emphasize the following members are private
|
private: // emphasize the following members are private
|
||||||
noncopyable( const noncopyable& );
|
noncopyable( const noncopyable& );
|
||||||
noncopyable& operator=( const noncopyable& );
|
noncopyable& operator=( const noncopyable& );
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user