Commit f61432c6 authored by Davis King's avatar Davis King

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

parent 1ff7cd1a
...@@ -7,14 +7,9 @@ ...@@ -7,14 +7,9 @@
#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 dlib
{ {
namespace noncopyable_ // protection from unintended ADL
{
class noncopyable class noncopyable
{ {
/*! /*!
...@@ -27,20 +22,10 @@ namespace boost ...@@ -27,20 +22,10 @@ namespace boost
noncopyable() {} noncopyable() {}
~noncopyable() {} ~noncopyable() {}
private: // emphasize the following members are private private: // emphasize the following members are private
noncopyable( const noncopyable& ); noncopyable(const noncopyable&);
const noncopyable& operator=( const noncopyable& ); const noncopyable& operator=(const noncopyable&);
};
}
typedef noncopyable_::noncopyable noncopyable;
} // namespace boost };
#endif // BOOST_NONCOPYABLE_HPP_INCLUDED
namespace dlib
{
using boost::noncopyable;
} }
#endif // DLIB_BOOST_NONCOPYABLE_HPP_INCLUDED #endif // DLIB_BOOST_NONCOPYABLE_HPP_INCLUDED
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment