diff armadillo-3.900.4/include/armadillo_bits/undefine_conflicts.hpp @ 49:1ec0e2823891

Switch to using subrepo copies of qm-dsp, nnls-chroma, vamp-plugin-sdk; update Armadillo version; assume build without external BLAS/LAPACK

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/armadillo-3.900.4/include/armadillo_bits/undefine_conflicts.hpp	Thu Jun 13 10:25:24 2013 +0100
@@ -0,0 +1,44 @@
+// Copyright (C) 2008-2011 NICTA (www.nicta.com.au)
+// Copyright (C) 2008-2011 Conrad Sanderson
+// 
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+
+#if defined(log2)
+  #undef log2
+  
+  #if defined(__GNUG__)
+    #warning         "detected 'log2' macro and undefined it"
+  #elif defined(_MSC_VER)
+    #pragma message ("detected 'log2' macro and undefined it")
+  #endif
+#endif
+
+
+
+// 
+// whoever defined macros with the names "min" and "max" should be permanently removed from the gene pool
+
+#if defined(min)
+  #undef min
+  
+  #if defined(__GNUG__)
+    #warning         "detected 'min' macro and undefined it; you may wish to define NOMINMAX before including any windows header"
+  #elif defined(_MSC_VER)
+    #pragma message ("detected 'min' macro and undefined it; you may wish to define NOMINMAX before including any windows header")
+  #endif
+#endif
+
+#if defined(max)
+  #undef max
+  
+  #if defined(__GNUG__)
+    #warning         "detected 'max' macro and undefined it; you may wish to define NOMINMAX before including any windows header"
+  #elif defined(_MSC_VER)
+    #pragma message ("detected 'max' macro and undefined it; you may wish to define NOMINMAX before including any windows header")
+  #endif
+#endif
+