[mlpack-svn] r11928 - mlpack/trunk/src/mlpack/core/arma_extend

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2012-03-20 23:29:56 -0400 (Tue, 20 Mar 2012)
New Revision: 11928

Modified:
   mlpack/trunk/src/mlpack/core/arma_extend/promote_type.hpp
Log:
Oops, I did screw it up.


Modified: mlpack/trunk/src/mlpack/core/arma_extend/promote_type.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/promote_type.hpp	2012-03-21 03:04:40 UTC (rev 11927)
+++ mlpack/trunk/src/mlpack/core/arma_extend/promote_type.hpp	2012-03-21 03:29:56 UTC (rev 11928)
@@ -36,9 +36,7 @@
 template<> struct is_promotable<u64, u32> : public is_promotable_ok { typedef u64 result; };
 template<> struct is_promotable<u64, u16> : public is_promotable_ok { typedef u64 result; };
 template<> struct is_promotable<u64, u8 > : public is_promotable_ok { typedef u64 result; };
-#endif
 
-
 template<typename T> struct is_promotable<s64, std::complex<T> > : public is_promotable_ok { typedef std::complex<T> result; };
 template<typename T> struct is_promotable<u64, std::complex<T> > : public is_promotable_ok { typedef std::complex<T> result; };
 
@@ -50,7 +48,9 @@
 
 template<> struct is_promotable<u64, s64> : public is_promotable_ok { typedef s64 result; };  // float ?
 #endif
+
 template<> struct is_promotable<s32, s64> : public is_promotable_ok { typedef s64 result; };
+
 #ifndef ARMA_64BIT_WORD
 template<> struct is_promotable<u32, s64> : public is_promotable_ok { typedef s64 result; };  // float ?
 template<> struct is_promotable<s16, s64> : public is_promotable_ok { typedef s64 result; };
@@ -121,6 +121,5 @@
 template<> struct promote_type<u16, u64> : public promote_type_ok { typedef u64 result; };
 template<> struct promote_type<s8 , u64> : public promote_type_ok { typedef s64 result; };  // float ?
 template<> struct promote_type<u8 , u64> : public promote_type_ok { typedef u64 result; };
-#endif
 
-
+#endif