code cleanup

--HG-- extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402790

code cleanup
--HG-- extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402790
608fa456 · Davis King · 03469d08 · 608fa456
Commit 608fa456 authored Jan 05, 2009 by Davis King
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/dlib/matrix/matrix_assign_fwd.h
+++ b/dlib/matrix/matrix_assign_fwd.h
@@ -52,7 +52,7 @@ namespace dlib
 // ----------------------------------------------------------------------------------------

    template <typename EXP1, typename EXP2>
-    inline typename enable_if<is_same_type<typename EXP1::layout_type, row_major_layout> >::type  
+    inline typename disable_if<ma::has_column_major_layout<EXP1> >::type  
    matrix_assign_default (
        EXP1& dest,
        const EXP2& src
@@ -78,7 +78,7 @@ namespace dlib
 // ----------------------------------------------------------------------------------------

    template <typename EXP1, typename EXP2>
-    inline typename enable_if<is_same_type<typename EXP1::layout_type, column_major_layout> >::type  
+    inline typename enable_if<ma::has_column_major_layout<EXP1> >::type  
    matrix_assign_default (
        EXP1& dest,
        const EXP2& src