[med-svn] r21926 - trunk/packages/mrs/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2016-05-10 19:46:11 +0000 (Tue, 10 May 2016)
New Revision: 21926

Added:
   trunk/packages/mrs/trunk/debian/patches/gcc-6.patch
Modified:
   trunk/packages/mrs/trunk/debian/patches/series
Log:
Add patch to fix compilation with gcc-6

Added: trunk/packages/mrs/trunk/debian/patches/gcc-6.patch
===================================================================
--- trunk/packages/mrs/trunk/debian/patches/gcc-6.patch	                        (rev 0)
+++ trunk/packages/mrs/trunk/debian/patches/gcc-6.patch	2016-05-10 19:46:11 UTC (rev 21926)
@@ -0,0 +1,9 @@
+--- a/src/M6Matrix.cpp
++++ b/src/M6Matrix.cpp
+@@ -316,5 +316,5 @@
+ };
+ 
+ const float
+-	kMPam250ScalingFactor = log(2.f) / 3.0f,
++        kMPam250ScalingFactor = std::log(2.f) / 3.0f,
+ 	kMPam250MisMatchAverage = -1.484210526f;

Modified: trunk/packages/mrs/trunk/debian/patches/series
===================================================================
--- trunk/packages/mrs/trunk/debian/patches/series	2016-05-10 13:58:49 UTC (rev 21925)
+++ trunk/packages/mrs/trunk/debian/patches/series	2016-05-10 19:46:11 UTC (rev 21926)
@@ -1,2 +1,3 @@
 makefile.diff
 init_d.diff
+gcc-6.patch