[mlpack-git] master: Manually set flag for _WIN64 (1f75ba1)

gitdub at mlpack.org gitdub at mlpack.org
Mon Mar 21 23:47:20 EDT 2016


Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/14273c052df81f1b77be2b9750b47bd202420329...758d2773e4165530839dd72f2311943e13952b34

>---------------------------------------------------------------

commit 1f75ba1ce226cce3d8129ca315542505a037cd48
Author: Cloud Han <heliumhgy at gmail.com>
Date:   Tue Mar 22 11:47:20 2016 +0800

    Manually set flag for _WIN64
    
    Manually set `ARMA_{64,32}BIT_WORD` for `{_WIN64,otherwise}` for windows build
    This potentially eliminate tons of `warning C4267`


>---------------------------------------------------------------

1f75ba1ce226cce3d8129ca315542505a037cd48
 src/mlpack/core/arma_extend/arma_extend.hpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/mlpack/core/arma_extend/arma_extend.hpp b/src/mlpack/core/arma_extend/arma_extend.hpp
index 65689ca..a4a3e35 100644
--- a/src/mlpack/core/arma_extend/arma_extend.hpp
+++ b/src/mlpack/core/arma_extend/arma_extend.hpp
@@ -24,6 +24,21 @@
 #define ARMA_EXTRA_CUBE_PROTO mlpack/core/arma_extend/Cube_extra_bones.hpp
 #define ARMA_EXTRA_CUBE_MEAT mlpack/core/arma_extend/Cube_extra_meat.hpp
 
+// Manually set ARMA_{64,32}BIT_WORD for _WIN64 or win32
+#if defined(_MSC_VER)
+    #ifdef _WIN64
+        #define ARMA_64BIT_WORD
+        #ifdef ARMA_32BIT_WORD
+            #undef ARMA_32BIT_WORD
+        #endif
+    #else
+        #define ARMA_32BIT_WORD
+        #ifdef ARMA_64BIT_WORD
+            #undef ARMA_64BIT_WORD
+        #endif
+    #endif
+#endif
+
 // Make sure that U64 and S64 support is enabled.
 #ifndef ARMA_USE_U64S64
   #define ARMA_USE_U64S64




More information about the mlpack-git mailing list