OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlib/noncopyable.h
View File

@ -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
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