Mercurial > octave-nkf
changeset 13730:a2c74b5c02de
[MSVC] Prevent duplicate symbol.
* txt-eng-ft.cc: Include PermMatrix.h, only for MSVC.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Thu, 20 Oct 2011 12:54:32 +0100 |
| parents | d13b6086aea9 |
| children | 3b52038e6e6c |
| files | src/txt-eng-ft.cc |
| diffstat | 1 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/txt-eng-ft.cc Thu Oct 20 12:54:26 2011 +0100 +++ b/src/txt-eng-ft.cc Thu Oct 20 12:54:32 2011 +0100 @@ -55,6 +55,14 @@ c); } +#ifdef _MSC_VER +// This is just a trick to avoid multiply symbols definition. +// PermMatrix.h contains a dllexport'ed Array<octave_idx_type> +// that will make MSVC not to generate new instantiation and +// use the imported one. +#include "PermMatrix.h" +#endif + class ft_manager {