merged

16ea6f11 · Davis King · 0ad60388 · 2dd29674 · 16ea6f11 · 16ea6f11
Commit 16ea6f11 authored Sep 23, 2015 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CMakeLists.txt dlib/CMakeLists.txt +1 -0

matrix.h dlib/matrix/matrix.h +2 -2

No files found.
--- a/dlib/CMakeLists.txt
+++ b/dlib/CMakeLists.txt
@@ -7,6 +7,7 @@
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)

 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)
 include(release_build_by_default)

--- a/dlib/matrix/matrix.h
+++ b/dlib/matrix/matrix.h
@@ -958,9 +958,9 @@ namespace dlib
 // ----------------------------------------------------------------------------------------

    template <typename T>
-    class op_pointer_to_mat;
+    struct op_pointer_to_mat;
    template <typename T>
-    class op_pointer_to_col_vect;
+    struct op_pointer_to_col_vect;

    template <
        typename T,