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)