[med-svn] [SCM] aghermann branch, master, updated. 17c5ded0cb1e251d8640a94750eb700b2e062b2a

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 0fdd0d1376069e32fecee5f9447f025a3ac25e26
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Feb 24 14:08:10 2013 +0200

    edfhed.cc: #include argp.h after some cpp includes to obviate spurious id clashes when building with g++-4.8

diff --git a/src/tools/edfhed.cc b/src/tools/edfhed.cc
index 9bdf83b..015d2a8 100644
--- a/src/tools/edfhed.cc
+++ b/src/tools/edfhed.cc
@@ -10,17 +10,27 @@
  */
 
 
-#include <argp.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <utime.h>
-#include <stdlib.h>
-
+#include <cstdlib>
 #include <iostream>
-#include "libsigfile/edf.hh"
-#include "libsigfile/source.hh"
+
+//#include <argp.h>
 #include "common/fs.hh"
+#include "libsigfile/source.hh"
+#include "libsigfile/edf.hh"
+
+// there's some deep and curious issue argp.h brings up if it is
+// included before libsigfile/source.hh, causing g++-4.8 to errors such as this:
+//
+//  /usr/local/stow/gcc-4.8/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/include/smmintrin.h: In function ‘__m128i _mm_max_epu32(__m128i, __m128i)’:
+//  /usr/local/stow/gcc-4.8/lib/gcc/x86_64-unknown-linux-gnu/4.8.0/include/smmintrin.h:318: error: cannot convert ‘__v4si {aka int}’ to ‘__vector(4) int’ for argument ‘1’ to ‘__vector(4) int __builtin_ia32_pmaxud128(__vector(4) int, __vector(4) int)’
+//     return (__m128i) __builtin_ia32_pmaxud128 ((__v4si)__X, (__v4si)__Y);
+//
+// which must have to do with __vector clashing with some c++-specific
+// definition. Changing the order lets it go down all well. Whatever.
+#include <argp.h>
 
 #include "config.h"
 
@@ -402,7 +412,6 @@ main( int argc, char **argv)
 }
 
 
-
 // Local Variables:
 // Mode: c++
 // indent-tabs-mode: 8

-- 
Sleep experiment manager