Changed noncopyable.h to avoid a name clash with boost 1.56

This commit is contained in:
Davis King 2014-09-05 18:26:37 -04:00
parent 1ff7cd1ad7
commit f61432c626
1 changed files with 16 additions and 31 deletions

View File

@ -7,40 +7,25 @@
#ifndef DLIB_BOOST_NONCOPYABLE_HPP_INCLUDED #ifndef DLIB_BOOST_NONCOPYABLE_HPP_INCLUDED
#define DLIB_BOOST_NONCOPYABLE_HPP_INCLUDED #define DLIB_BOOST_NONCOPYABLE_HPP_INCLUDED
#ifndef BOOST_NONCOPYABLE_HPP_INCLUDED
#define BOOST_NONCOPYABLE_HPP_INCLUDED
namespace boost
{
namespace noncopyable_ // protection from unintended ADL
{
class noncopyable
{
/*!
This class makes it easier to declare a class as non-copyable.
If you want to make an object that can't be copied just inherit
from this object.
!*/
protected:
noncopyable() {}
~noncopyable() {}
private: // emphasize the following members are private
noncopyable( const noncopyable& );
const noncopyable& operator=( const noncopyable& );
};
}
typedef noncopyable_::noncopyable noncopyable;
} // namespace boost
#endif // BOOST_NONCOPYABLE_HPP_INCLUDED
namespace dlib namespace dlib
{ {
using boost::noncopyable; class noncopyable
{
/*!
This class makes it easier to declare a class as non-copyable.
If you want to make an object that can't be copied just inherit
from this object.
!*/
protected:
noncopyable() {}
~noncopyable() {}
private: // emphasize the following members are private
noncopyable(const noncopyable&);
const noncopyable& operator=(const noncopyable&);
};
} }
#endif // DLIB_BOOST_NONCOPYABLE_HPP_INCLUDED #endif // DLIB_BOOST_NONCOPYABLE_HPP_INCLUDED