mirror of
https://github.com/boostorg/system.git
synced 2025-07-31 13:07:13 +02:00
Remove =default/=delete workarounds
This commit is contained in:
@ -64,20 +64,11 @@ private:
|
|||||||
friend class error_code;
|
friend class error_code;
|
||||||
friend class error_condition;
|
friend class error_condition;
|
||||||
|
|
||||||
#if !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
error_category( error_category const & ) = delete;
|
error_category( error_category const & ) = delete;
|
||||||
error_category& operator=( error_category const & ) = delete;
|
error_category& operator=( error_category const & ) = delete;
|
||||||
|
|
||||||
#else
|
|
||||||
private:
|
|
||||||
|
|
||||||
error_category( error_category const & );
|
|
||||||
error_category& operator=( error_category const & );
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
boost::ulong_long_type id_;
|
boost::ulong_long_type id_;
|
||||||
@ -102,21 +93,8 @@ private:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS)
|
|
||||||
|
|
||||||
~error_category() = default;
|
~error_category() = default;
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
// We'd like to make the destructor protected, to make code that deletes
|
|
||||||
// an error_category* not compile; unfortunately, doing the below makes
|
|
||||||
// the destructor user-provided and hence breaks use after main, as the
|
|
||||||
// categories may get destroyed before code that uses them
|
|
||||||
|
|
||||||
// ~error_category() {}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !BOOST_WORKAROUND(BOOST_GCC, < 40800)
|
#if !BOOST_WORKAROUND(BOOST_GCC, < 40800)
|
||||||
BOOST_CONSTEXPR
|
BOOST_CONSTEXPR
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user