Uncommented some stuff.

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

Uncommented some stuff.
--HG-- extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402786
29679fc6 · Davis King · 5165cb52 · 29679fc6
Commit 29679fc6 authored Jan 04, 2009 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

matrix_assign_fwd.h dlib/matrix/matrix_assign_fwd.h +1 -3

No files found.
--- a/dlib/matrix/matrix_assign_fwd.h
+++ b/dlib/matrix/matrix_assign_fwd.h
@@ -93,7 +93,7 @@ namespace dlib
 // ----------------------------------------------------------------------------------------
    template <typename EXP1, typename EXP2>
-    inline void //inline typename enable_if<is_same_type<typename EXP1::layout_type, row_major_layout> >::type  
+    inline typename enable_if<is_same_type<typename EXP1::layout_type, row_major_layout> >::type  
    matrix_assign_default (
        EXP1& dest,
        const EXP2& src,
@@ -172,7 +172,6 @@ namespace dlib
 // ----------------------------------------------------------------------------------------
-#if 0
    template <typename EXP1, typename EXP2>
    inline typename enable_if<is_same_type<typename EXP1::layout_type, column_major_layout> >::type  
    matrix_assign_default (
@@ -250,7 +249,6 @@ namespace dlib
            }
        }
    }
-#endif
 // ----------------------------------------------------------------------------------------