From: David Sarrut Date: Mon, 29 Jul 2013 06:07:03 +0000 (+0200) Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk X-Git-Tag: v1.4.0~164^2~4 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=927e47b97d02227448b39fdb9211514961bcee0a;hp=83bd6160ddb570c67b77e4f4c38547d381faed3c;p=clitk.git Merge branch 'master' of git.creatis.insa-lyon.fr:clitk --- diff --git a/common/clitkMatrix.h b/common/clitkMatrix.h index 1e497ea..25b0fa1 100644 --- a/common/clitkMatrix.h +++ b/common/clitkMatrix.h @@ -20,6 +20,7 @@ #define clitkMatrix_h #include +#define VTK_EXCLUDE_STRSTREAM_HEADERS #include #include