Mercurial > hg > segmenter-vamp-plugin
comparison 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
author | Chris Cannam |
---|---|
date | Thu, 13 Jun 2013 10:25:24 +0100 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
48:69251e11a913 | 49:1ec0e2823891 |
---|---|
1 // Copyright (C) 2008-2011 NICTA (www.nicta.com.au) | |
2 // Copyright (C) 2008-2011 Conrad Sanderson | |
3 // | |
4 // This Source Code Form is subject to the terms of the Mozilla Public | |
5 // License, v. 2.0. If a copy of the MPL was not distributed with this | |
6 // file, You can obtain one at http://mozilla.org/MPL/2.0/. | |
7 | |
8 | |
9 | |
10 #if defined(log2) | |
11 #undef log2 | |
12 | |
13 #if defined(__GNUG__) | |
14 #warning "detected 'log2' macro and undefined it" | |
15 #elif defined(_MSC_VER) | |
16 #pragma message ("detected 'log2' macro and undefined it") | |
17 #endif | |
18 #endif | |
19 | |
20 | |
21 | |
22 // | |
23 // whoever defined macros with the names "min" and "max" should be permanently removed from the gene pool | |
24 | |
25 #if defined(min) | |
26 #undef min | |
27 | |
28 #if defined(__GNUG__) | |
29 #warning "detected 'min' macro and undefined it; you may wish to define NOMINMAX before including any windows header" | |
30 #elif defined(_MSC_VER) | |
31 #pragma message ("detected 'min' macro and undefined it; you may wish to define NOMINMAX before including any windows header") | |
32 #endif | |
33 #endif | |
34 | |
35 #if defined(max) | |
36 #undef max | |
37 | |
38 #if defined(__GNUG__) | |
39 #warning "detected 'max' macro and undefined it; you may wish to define NOMINMAX before including any windows header" | |
40 #elif defined(_MSC_VER) | |
41 #pragma message ("detected 'max' macro and undefined it; you may wish to define NOMINMAX before including any windows header") | |
42 #endif | |
43 #endif | |
44 |