Merge branch 'master' of https://github.com/davisking/dlib

dlib/optimization/optimization_bobyqa.h

@@ -18,8 +18,9 @@
 
 #include <algorithm>
 #include <cmath>
+#include <memory>
+
 #include "../matrix.h"
-#include "../smart_pointers.h"
 #include "optimization_bobyqa_abstract.h"
 #include "optimization.h"
 
@@ -59,7 +60,7 @@ namespace dlib
         {
             const unsigned long n = x.size();
             const unsigned long w_size = (npt+5)*(npt+n)+3*n*(n+5)/2;
-            scoped_ptr<doublereal[]> w(new doublereal[w_size]);
+            std::unique_ptr<doublereal[]> w(new doublereal[w_size]);
 
             // make these temporary matrices becuse U might be some
             // kind of matrix_exp that doesn't support taking the address

dlib/serialize.h

@@ -151,6 +151,7 @@
 #include <deque>
 #include <complex>
 #include <map>
+#include <memory>
 #include <set>
 #include <limits>
 #include "uintn.h"
@@ -160,7 +161,6 @@
 #include "unicode.h"
 #include "byte_orderer.h"
 #include "float_details.h"
-#include "smart_pointers/shared_ptr.h"
 
 namespace dlib
 {
@@ -1490,7 +1490,7 @@ namespace dlib
         }
 
     private:
-        shared_ptr<std::ofstream> fout;
+        std::shared_ptr<std::ofstream> fout;
     };
 
     class proxy_deserialize 
@@ -1513,7 +1513,7 @@ namespace dlib
         }
 
     private:
-        shared_ptr<std::ifstream> fin;
+        std::shared_ptr<std::ifstream> fin;
     };
 
     inline proxy_serialize serialize(const std::string& filename)

dlib/server/server_kernel.h

@@ -5,13 +5,14 @@
 
 #include "server_kernel_abstract.h"
 
+#include <memory>
+#include <string>
+
 #include "../threads.h"
 #include "../sockets.h"
-#include <string>
 #include "../algs.h"
 #include "../set.h"
 #include "../logger.h"
-#include "../smart_pointers.h"
 
 
 namespace dlib
@@ -209,8 +210,8 @@ namespace dlib
             int max_connections;
             mutex max_connections_mutex;
             signaler thread_count_zero;
-            scoped_ptr<thread_function> async_start_thread;
-            scoped_ptr<listener> sock;
+            std::unique_ptr<thread_function> async_start_thread;
+            std::unique_ptr<listener> sock;
             unsigned long graceful_close_timeout;
 
 

dlib/simd/simd_check.h

@@ -66,7 +66,11 @@
                 #define DLIB_HAVE_POWER_VEC
             #endif
         #endif
-
+        #ifdef __ARM_NEON
+            #ifndef DLIB_HAVE_NEON
+                #define DLIB_HAVE_NEON
+            #endif
+        #endif
     #endif
 #endif
 
@@ -97,7 +101,9 @@
     #include <immintrin.h> // AVX
 //    #include <avx2intrin.h>
 #endif
-
+#ifdef DLIB_HAVE_NEON
+    #include <arm_neon.h> // ARM NEON
+#endif
 
 
 #endif // DLIB_SIMd_CHECK_Hh_

dlib/smart_pointers.h

@@ -3,9 +3,21 @@
 #ifndef DLIB_SMART_POINTERs_H_
 #define DLIB_SMART_POINTERs_H_ 
 
-#include "smart_pointers/scoped_ptr.h"
+// This is legacy smart pointer code that will likely to stop working under default
+// compiler flags when C++17 becomes the default standard in the compilers.
+// Please consider migrating your code to contemporary smart pointers from C++
+// standard library. The warning below will help to detect if the deprecated code
+// was included from library's clients.
+#if (defined(__GNUC__) && ((__GNUC__ >= 4 && __GNUC_MINOR__ >= 8) || (__GNUC__ > 4))) || \
+  (defined(__clang__) && ((__clang_major__ >= 3 && __clang_minor__ >= 4)))
+#pragma GCC warning "smart_pointers.h is included which will fail to compile under C++17"
+#endif
+
+#include <memory>
+
 #include "smart_pointers/shared_ptr.h"
 #include "smart_pointers/weak_ptr.h"
+#include "smart_pointers/scoped_ptr.h"
 
 #endif // DLIB_SMART_POINTERs_H_