Merge branch 'davisking:master' into cpu-cuda-toggle

Author: kSkip

dlib/CMakeLists.txt

@@ -16,8 +16,8 @@ endif()
 project(dlib)
 
 set(CPACK_PACKAGE_NAME "dlib")
-set(CPACK_PACKAGE_VERSION_MAJOR "19")
-set(CPACK_PACKAGE_VERSION_MINOR "24")
+set(CPACK_PACKAGE_VERSION_MAJOR "20")
+set(CPACK_PACKAGE_VERSION_MINOR "0")
 set(CPACK_PACKAGE_VERSION_PATCH "99")
 set(VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 # Only print these messages once, even if dlib is added multiple times via add_subdirectory()

dlib/any/any.h

@@ -39,7 +39,7 @@ namespace dlib
             if (contains<T_>())
                 storage.unsafe_get<T_>() = std::forward<T>(item);
             else
-                *this = std::move(any{std::forward<T>(item)});
+                *this = any{std::forward<T>(item)};
             return *this;
         }
 

dlib/any/any_abstract.h

@@ -20,7 +20,7 @@ namespace dlib
         !*/
 
     public:
-          virtual const char* what() const throw() { return "bad_any_cast"; }
+          virtual const char* what() const noexcept { return "bad_any_cast"; }
     };
 
 // ----------------------------------------------------------------------------------------

dlib/any/storage.h

@@ -248,7 +248,7 @@ namespace dlib
             !*/
             {
                 if (this != &other) 
-                    *this = std::move(storage_heap{other});
+                    *this = storage_heap{other};
                 return *this;
             }
 

dlib/array2d/array2d_generic_image.h

@@ -54,7 +54,7 @@ namespace dlib
     }
 
     template <typename T, typename mm>
-    inline long width_step(
+    inline size_t width_step(
         const array2d<T,mm>& img
     ) 
     { 

dlib/array2d/array2d_kernel.h

@@ -320,7 +320,7 @@ namespace dlib
         size_t size (
         ) const { return static_cast<size_t>(nc_) * static_cast<size_t>(nr_); }
 
-        long width_step (
+        size_t width_step (
         ) const
         {
             return nc_*sizeof(T);

dlib/array2d/array2d_kernel_abstract.h

@@ -242,7 +242,7 @@ namespace dlib
                 - returns #*this
         !*/
 
-        long width_step (
+        size_t width_step (
         ) const;
         /*!
             ensures

dlib/cmd_line_parser/cmd_line_parser_check_1.h

@@ -82,7 +82,7 @@ namespace dlib
                 required_opts()
             { set_info_string(); }
 
-            ~cmd_line_check_error() throw() {}
+            ~cmd_line_check_error() noexcept {}
 
             void set_info_string (
             )

dlib/cmd_line_parser/cmd_line_parser_kernel_1.h

@@ -119,7 +119,7 @@ namespace dlib
                 num(0)
             { set_info_string();}
 
-            ~cmd_line_parse_error() throw() {}
+            ~cmd_line_parse_error() noexcept {}
 
             const std::basic_string<charT> item;
             const unsigned long num;

dlib/config_reader/config_reader_kernel_1.h

@@ -90,7 +90,7 @@ namespace dlib
                 file_name(file_name_)
             {}
 
-            ~file_not_found() throw() {}
+            ~file_not_found() noexcept {}
 
         public:
             const std::string file_name;
@@ -117,7 +117,7 @@ namespace dlib
                 const_cast<std::string&>(info) = sout.str();
             }
 
-            ~config_reader_access_error() throw() {}
+            ~config_reader_access_error() noexcept {}
             const std::string block_name;
             const std::string key_name;
         };