[med-svn] [SCM] aghermann branch, master, updated. 4f7a3b774136ffffbaf9b05d90bd568347bc5461

[andrei zavada]

The following commit has been merged in the master branch:
commit 6e0eb374357acde55e155c3ab05967fe7af50663
Author: andrei zavada <johnhommer at gmail.com>
Date:   Thu Oct 25 00:06:40 2012 +0300

    silence a spurious -Wformat in SExpDesignUI::load_artifact_detection_profiles

diff --git a/src/ui/ed.cc b/src/ui/ed.cc
index 8d98457..873a4b3 100644
--- a/src/ui/ed.cc
+++ b/src/ui/ed.cc
@@ -268,6 +268,9 @@ load_artifact_detection_profiles()
 			sigfile::SArtifactDetectionPP P;
 			DEF_UNIQUE_CHARP (_);
 			int int_estimate_E, int_use_range;
+// at least gcc 4.7.2 fails to recognize "%as" (dynamic allocation), so
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic push
 			if ( 16 ==
 			     fscanf( domien, "%a[^\n]\n%la  %la %la  %la %la %la  %la %la  %la %la %la "
 				     "%zu %zu %d %d",
@@ -284,6 +287,7 @@ load_artifact_detection_profiles()
 				P.estimate_E = (bool)int_estimate_E;
 				P.use_range = (bool)int_use_range;
 				global_artifact_detection_profiles[_] = P;
+#pragma GCC diagnostic pop
 			} else
 				break;
 		}

-- 
Sleep experiment manager