[med-svn] r21309 - trunk/packages/insighttoolkit/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2016-01-26 18:53:53 +0000 (Tue, 26 Jan 2016)
New Revision: 21309

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/itk_vxl_gcc6.patch
Log:
Work on gcc-6 transition, add patch

Added: trunk/packages/insighttoolkit/trunk/debian/patches/itk_vxl_gcc6.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk_vxl_gcc6.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk_vxl_gcc6.patch	2016-01-26 18:53:53 UTC (rev 21309)
@@ -0,0 +1,61 @@
+From 7633bd09c95f6bac6e861f7d965f0965b0e6f328 Mon Sep 17 00:00:00 2001
+From: Martin Michlmayr <tbm at hpe.com>
+Date: Wed, 20 Jan 2016 13:43:36 -0800
+Subject: [PATCH 1/1] COMP: fixed error "Dunno about this gcc" for gcc 6
+
+---
+ Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx | 10 ++++++++++
+ Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h              |  9 ++++++++-
+ 2 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx b/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
+index 2d2d232..f473897 100644
+--- a/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
++++ b/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx
+@@ -111,6 +111,16 @@ int test_preprocessor_main(int /*argc*/,char* /*argv*/[])
+   ++minor_count;
+ #endif
+ 
++#ifdef VCL_GCC_6
++  ++major_count;
++#endif
++#ifdef VCL_GCC_60
++  ++minor_count;
++#endif
++#ifdef VCL_GCC_61
++  ++minor_count;
++#endif
++
+ #ifdef VCL_VC
+   ++compiler_count;
+ #endif
+diff --git a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
+index c6bcf84..f7b4fdb 100644
+--- a/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
++++ b/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h
+@@ -133,6 +133,13 @@
+ #  else
+ #   define VCL_GCC_50
+ #  endif
++# elif (__GNUC__==6)
++#  define VCL_GCC_6
++#  if (__GNUC_MINOR__ > 0 )
++#   define VCL_GCC_61
++#  else
++#   define VCL_GCC_60
++#  endif
+ # else
+ #  error "Dunno about this gcc"
+ # endif
+@@ -252,7 +259,7 @@
+ 
+ // This *needs* to come after vcl_config_headers.h
+ #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+-# if defined(VCL_GCC_3) || defined(VCL_GCC_4) || defined(VCL_GCC_5)
++# if defined(VCL_GCC_3) || defined(VCL_GCC_4) || defined(VCL_GCC_5) || defined(VCL_GCC_6)
+ #  define GNU_LIBSTDCXX_V3 1
+ # elif !defined(GNU_LIBSTDCXX_V3) && defined(VCL_GCC_295) && VCL_CXX_HAS_HEADER_ISTREAM
+ // One difference between v2 and v3 is that the former has
+-- 
+1.9.1
+