Skip to content

GitLab

Commit 16ea6f11 authored by Davis King's avatar Davis King
Browse files

merged

parents 0ad60388 2dd29674
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dlib/CMakeLists.txt
View file @ 16ea6f11
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
cmake_minimum_required(VERSION 2.4) cmake_minimum_required(VERSION 2.4)
set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
# default to a Release build (except if CMAKE_BUILD_TYPE is set) # default to a Release build (except if CMAKE_BUILD_TYPE is set)
include(release_build_by_default) include(release_build_by_default)
......
dlib/matrix/matrix.h
View file @ 16ea6f11
...@@ -958,9 +958,9 @@ namespace dlib ...@@ -958,9 +958,9 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template <typename T> template <typename T>
class op_pointer_to_mat; struct op_pointer_to_mat;
template <typename T> template <typename T>
class op_pointer_to_col_vect; struct op_pointer_to_col_vect;
template < template <
typename T, typename T,
......
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