Commit d873810e authored by Séverin Lemaignan's avatar Séverin Lemaignan

Add pragma guards around deprecated auto_ptr to prevent GCC warnings

Fixes #67
parent 6bd5c2e3
...@@ -294,6 +294,8 @@ namespace dlib ...@@ -294,6 +294,8 @@ namespace dlib
shared_node->ref_count += 1; shared_node->ref_count += 1;
} }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
template<typename Y> template<typename Y>
explicit shared_ptr( explicit shared_ptr(
std::auto_ptr<Y>& r std::auto_ptr<Y>& r
...@@ -308,6 +310,7 @@ namespace dlib ...@@ -308,6 +310,7 @@ namespace dlib
shared_node->del = new default_deleter; shared_node->del = new default_deleter;
data = r.release(); data = r.release();
} }
#pragma GCC diagnostic pop
shared_ptr& operator= ( shared_ptr& operator= (
const shared_ptr& r const shared_ptr& r
...@@ -326,6 +329,8 @@ namespace dlib ...@@ -326,6 +329,8 @@ namespace dlib
return *this; return *this;
} }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
template<typename Y> template<typename Y>
shared_ptr& operator= ( shared_ptr& operator= (
std::auto_ptr<Y>& r std::auto_ptr<Y>& r
...@@ -343,6 +348,7 @@ namespace dlib ...@@ -343,6 +348,7 @@ namespace dlib
data = r.release(); data = r.release();
return *this; return *this;
} }
#pragma GCC diagnostic pop
void reset() void reset()
{ {
......
...@@ -257,7 +257,8 @@ namespace dlib ...@@ -257,7 +257,8 @@ namespace dlib
} }
} }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
template<typename Y> template<typename Y>
explicit shared_ptr_thread_safe( explicit shared_ptr_thread_safe(
std::auto_ptr<Y>& r std::auto_ptr<Y>& r
...@@ -271,6 +272,7 @@ namespace dlib ...@@ -271,6 +272,7 @@ namespace dlib
shared_node = new shared_ptr_thread_safe_node; shared_node = new shared_ptr_thread_safe_node;
data = r.release(); data = r.release();
} }
#pragma GCC diagnostic push
shared_ptr_thread_safe& operator= ( shared_ptr_thread_safe& operator= (
const shared_ptr_thread_safe& r const shared_ptr_thread_safe& r
...@@ -289,6 +291,8 @@ namespace dlib ...@@ -289,6 +291,8 @@ namespace dlib
return *this; return *this;
} }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
template<typename Y> template<typename Y>
shared_ptr_thread_safe& operator= ( shared_ptr_thread_safe& operator= (
std::auto_ptr<Y>& r std::auto_ptr<Y>& r
...@@ -305,6 +309,7 @@ namespace dlib ...@@ -305,6 +309,7 @@ namespace dlib
data = r.release(); data = r.release();
return *this; return *this;
} }
#pragma GCC diagnostic push
void reset() void reset()
{ {
......
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