Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
f61432c6
Commit
f61432c6
authored
Sep 05, 2014
by
Davis King
Browse files
Changed noncopyable.h to avoid a name clash with boost 1.56
parent
1ff7cd1a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
31 deletions
+16
-31
dlib/noncopyable.h
dlib/noncopyable.h
+16
-31
No files found.
dlib/noncopyable.h
View file @
f61432c6
...
...
@@ -7,14 +7,9 @@
#ifndef 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
{
/*!
...
...
@@ -27,20 +22,10 @@ namespace boost
noncopyable
()
{}
~
noncopyable
()
{}
private:
// emphasize the following members are private
noncopyable
(
const
noncopyable
&
);
const
noncopyable
&
operator
=
(
const
noncopyable
&
);
};
}
typedef
noncopyable_
::
noncopyable
noncopyable
;
noncopyable
(
const
noncopyable
&
);
const
noncopyable
&
operator
=
(
const
noncopyable
&
);
}
// namespace boost
#endif // BOOST_NONCOPYABLE_HPP_INCLUDED
namespace
dlib
{
using
boost
::
noncopyable
;
};
}
#endif // DLIB_BOOST_NONCOPYABLE_HPP_INCLUDED
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment