Skip to content

D
dlib
Commit a3dad7ac authored by Davis King's avatar Davis King
Browse files
Options

fixed compiler warnings in old gcc

parent 6b064d35
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlib/smart_pointers/shared_ptr.h
View file @ a3dad7ac
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// Don't warn about the use of std::auto_ptr in this file. There is a pragma at the end of // Don't warn about the use of std::auto_ptr in this file. There is a pragma at the end of
// this file that re-enables the warning. // this file that re-enables the warning.
#ifdef __GNUC__ #if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
...@@ -527,7 +527,7 @@ namespace dlib ...@@ -527,7 +527,7 @@ namespace dlib
} }
#ifdef __GNUC__ #if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
......
dlib/smart_pointers/shared_ptr_thread_safe.h
View file @ a3dad7ac
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// Don't warn about the use of std::auto_ptr in this file. There is a pragma at the end of // Don't warn about the use of std::auto_ptr in this file. There is a pragma at the end of
// this file that re-enables the warning. // this file that re-enables the warning.
#ifdef __GNUC__ #if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
...@@ -497,7 +497,7 @@ namespace dlib ...@@ -497,7 +497,7 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
#ifdef __GNUC__ #if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
......
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