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

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

Author: rcurtin
Date: 2012-03-20 23:46:15 -0400 (Tue, 20 Mar 2012)
New Revision: 11930

Modified:
   mlpack/trunk/src/mlpack/core/arma_extend/traits.hpp
Log:
It makes no difference in reality, but don't define is_supported_elem_type<u64>
or is_supported_elem_type<s64> if ARMA_64BIT_WORD is used.


Modified: mlpack/trunk/src/mlpack/core/arma_extend/traits.hpp
===================================================================
--- mlpack/trunk/src/mlpack/core/arma_extend/traits.hpp	2012-03-21 03:44:24 UTC (rev 11929)
+++ mlpack/trunk/src/mlpack/core/arma_extend/traits.hpp	2012-03-21 03:46:15 UTC (rev 11930)
@@ -12,6 +12,9 @@
 // For new Armadillo versions ( > 1.2.0 ) we have to get a little bit more
 // tricky.  We will overload the values for the is_supported_elem_type
 // structure, allowing us to redefine it to report success for u64s and s64s.
+
+// This isn't necessary if Armadillo was compiled with 64-bit support.
+#ifndef ARMA_64BIT_WORD
 template<>
 struct is_supported_elem_type<u64>
   {
@@ -24,3 +27,5 @@
   static const bool value = true;
   };
 #endif
+
+#endif