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

Andrei Zavada johnhommer at gmail.com
Sun Feb 3 12:53:06 UTC 2013 

The following commit has been merged in the master branch:
commit 1f9a5a18d5035cc56c61750055f5773892da002a
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Feb 3 11:19:38 2013 +0200

    revert CXXFLAGS to use -std=c++0x not c++11, for gcc-4.6.3 builds

diff --git a/configure.ac b/configure.ac
index bce85b3..eaaa562 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
-AC_COPYRIGHT([Copyright (c) 2008-12 Andrei Zavada <johnhommer at gmail.com>])
+AC_COPYRIGHT([Copyright (c) 2008-13 Andrei Zavada <johnhommer at gmail.com>])
 
-AC_INIT([Aghermann], [0.8_rc], [johnhommer at gmail.com])
+AC_INIT([Aghermann], [0.8], [johnhommer at gmail.com])
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)
@@ -23,7 +23,7 @@ AC_DEFUN([AC_CXX_STDCPP11_FEATURES],
 ac_cv_cxx_cpp11_features,
 [AC_LANG([C++])
  old_CXX=$CXX
- CXX="$CXX -std=c++11"
+ CXX="$CXX -std=c++0x"
  AC_TRY_RUN([
     #include <vector>
     #include <algorithm>
diff --git a/src/Makefile.am b/src/Makefile.am
index 3136dde..d943376 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS := \
 	tools
 
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti \
+	-Wall -std=c++0x -fno-rtti \
 	$(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
 	$(OPENMP_CXXFLAGS) \
 	-DBUILT_BY=\"@user@\"
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index fced200..209e348 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti \
+	-Wall -std=c++0x -fno-rtti \
 	-I$(top_srcdir)/src
 
 noinst_LIBRARIES := \
diff --git a/src/expdesign/Makefile.am b/src/expdesign/Makefile.am
index d72ffe9..869636b 100644
--- a/src/expdesign/Makefile.am
+++ b/src/expdesign/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti \
+	-Wall -std=c++0x -fno-rtti \
 	$(OPENMP_CXXFLAGS) \
 	-I$(top_srcdir)/src
 
diff --git a/src/ica/Makefile.am b/src/ica/Makefile.am
index f88513e..d744e5c 100644
--- a/src/ica/Makefile.am
+++ b/src/ica/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti \
+	-Wall -std=c++0x -fno-rtti \
 	-I$(top_srcdir)/src
 
 
diff --git a/src/libsigfile/Makefile.am b/src/libsigfile/Makefile.am
index a7f1d8e..395af14 100644
--- a/src/libsigfile/Makefile.am
+++ b/src/libsigfile/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti -shared \
+	-Wall -std=c++0x -fno-rtti -shared \
 	-I$(top_srcdir)/src \
 	-fPIC
 
diff --git a/src/metrics/Makefile.am b/src/metrics/Makefile.am
index f6ecfd2..4e2cfff 100644
--- a/src/metrics/Makefile.am
+++ b/src/metrics/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti \
+	-Wall -std=c++0x -fno-rtti \
 	$(OPENMP_CXXFLAGS) \
 	-I$(top_srcdir)/src
 
@@ -17,9 +17,7 @@ liba_a_SOURCES := \
 	mc.hh \
 	mc-artifacts.cc \
 	mc-artifacts.hh \
-	mc-artifacts.ii \
-	phasic-events.ii \
-	phasic-events.hh
+	mc-artifacts.ii
 
 if DO_PCH
 BUILT_SOURCES := \
@@ -28,8 +26,7 @@ BUILT_SOURCES := \
 	psd.hh.gch \
 	swu.hh.gch \
 	mc.hh.gch \
-	mc-artifacts.hh.gch \
-	phasic-events.hh.gch
+	mc-artifacts.hh.gch
 %.hh.gch: %.hh
 	$(CXXCOMPILE) -c $<
 CLEANFILES = \
diff --git a/src/model/Makefile.am b/src/model/Makefile.am
index 0110481..7e86bed 100644
--- a/src/model/Makefile.am
+++ b/src/model/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti \
+	-Wall -std=c++0x -fno-rtti \
 	-I$(top_srcdir)/src
 
 noinst_LIBRARIES := liba.a
diff --git a/src/patterns/Makefile.am b/src/patterns/Makefile.am
index 57659ac..e4fef5f 100644
--- a/src/patterns/Makefile.am
+++ b/src/patterns/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti \
+	-Wall -std=c++0x -fno-rtti \
 	-I$(top_srcdir)/src
 
 noinst_LIBRARIES := liba.a
diff --git a/src/sigproc/Makefile.am b/src/sigproc/Makefile.am
index ef55ba0..966bb5c 100644
--- a/src/sigproc/Makefile.am
+++ b/src/sigproc/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti \
+	-Wall -std=c++0x -fno-rtti \
 	-I$(top_srcdir)/src
 
 noinst_LIBRARIES := liba.a
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 37d2d8b..fa2869a 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-Wall -std=c++11 -fno-rtti \
+	-Wall -std=c++0x -fno-rtti \
 	-I$(top_srcdir)/src
 
 bin_PROGRAMS := \
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 391d2db..5df8192 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS := sm mw sf mf
 AM_CXXFLAGS := \
-	-std=c++11 -fno-rtti -Wdeprecated-declarations \
+	-std=c++0x -fno-rtti -Wdeprecated-declarations \
 	$(GTK_CFLAGS) $(UNIQUE_CFLAGS) \
 	-DPACKAGE_DATADIR=\"$(datadir)\" \
 	$(OPENMP_CXXFLAGS) \
diff --git a/src/ui/mf/Makefile.am b/src/ui/mf/Makefile.am
index a5de050..fd5302e 100644
--- a/src/ui/mf/Makefile.am
+++ b/src/ui/mf/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
+	-std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
 	$(GTK_CFLAGS) $(LIBCONFIGXX_CFLAGS) $(UNIQUE_CFLAGS) \
 	-DPACKAGE_DATADIR=\"$(datadir)\" \
 	$(OPENMP_CXXFLAGS) \
diff --git a/src/ui/mw/Makefile.am b/src/ui/mw/Makefile.am
index e320e5d..2ca8d48 100644
--- a/src/ui/mw/Makefile.am
+++ b/src/ui/mw/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS = \
-	-std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
+	-std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
 	$(GTK_CFLAGS) $(VTE_CFLAGS) $(CAIRO_CFLAGS) $(UNIQUE_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
 	-DPACKAGE_DATADIR=\"$(datadir)\" \
 	$(OPENMP_CXXFLAGS) \
diff --git a/src/ui/sf/Makefile.am b/src/ui/sf/Makefile.am
index c241642..4e40167 100644
--- a/src/ui/sf/Makefile.am
+++ b/src/ui/sf/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS := \
 	d
 
 AM_CXXFLAGS := \
-	-std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
+	-std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
 	$(GTK_CFLAGS)  $(UNIQUE_CFLAGS)  $(CAIRO_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
 	-DPACKAGE_DATADIR=\"$(datadir)\" \
 	$(OPENMP_CXXFLAGS) \
@@ -20,7 +20,6 @@ liba_a_SOURCES := \
 	montage.cc \
 	montage-overlays.cc \
 	montage_cb.cc \
-	phasic-events.cc \
 	widgets.hh \
 	sf.cc \
 	sf.hh \
diff --git a/src/ui/sf/d/Makefile.am b/src/ui/sf/d/Makefile.am
index a9cbd2a..79b9525 100644
--- a/src/ui/sf/d/Makefile.am
+++ b/src/ui/sf/d/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
+	-std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
 	$(GTK_CFLAGS)  $(UNIQUE_CFLAGS) $(CAIRO_CFLAGS) \
 	-DPACKAGE_DATADIR=\"$(datadir)\" \
 	$(OPENMP_CXXFLAGS) \
diff --git a/src/ui/sm/Makefile.am b/src/ui/sm/Makefile.am
index 1598031..a135a84 100644
--- a/src/ui/sm/Makefile.am
+++ b/src/ui/sm/Makefile.am
@@ -1,5 +1,5 @@
 AM_CXXFLAGS := \
-	-std=c++11 -fno-rtti -Wdeprecated-declarations -Wall \
+	-std=c++0x -fno-rtti -Wdeprecated-declarations -Wall \
 	$(GTK_CFLAGS) $(UNIQUE_CFLAGS) $(LIBCONFIGXX_CFLAGS) \
 	-DPACKAGE_DATADIR=\"$(datadir)\" \
 	$(OPENMP_CXXFLAGS) \

-- 
Sleep experiment manager

More information about the debian-med-commit mailing list