[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
262/376: Revert "Drop support for pre-c++11 compilers."
From: |
Ludovic Courtès |
Subject: |
262/376: Revert "Drop support for pre-c++11 compilers." |
Date: |
Wed, 28 Jan 2015 22:05:29 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit f040159f77e518e5eda87a0c092e6c20d87a572b
Author: Shea Levy <address@hidden>
Date: Mon Oct 20 11:33:48 2014 -0400
Revert "Drop support for pre-c++11 compilers."
The breakage this fixed can be worked around without removing support.
This reverts commit 84a13dc576496f1227665259c61f86184f452f51.
---
Makefile | 2 +-
release.nix | 6 ++++++
src/libutil/types.hh | 3 ++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 5ada603..b41a820 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ makefiles = \
doc/manual/local.mk \
tests/local.mk
-GLOBAL_CXXFLAGS += -std=c++11 -g -Wall
+GLOBAL_CXXFLAGS += -std=c++0x -g -Wall
include Makefile.config
diff --git a/release.nix b/release.nix
index bd90b78..e84f496 100644
--- a/release.nix
+++ b/release.nix
@@ -181,6 +181,8 @@ let
};
+ rpm_fedora16i386 = makeRPM_i686 (diskImageFuns:
diskImageFuns.fedora16i386) 50;
+ rpm_fedora16x86_64 = makeRPM_x86_64 (diskImageFunsFun:
diskImageFunsFun.fedora16x86_64) 50;
rpm_fedora18i386 = makeRPM_i686 (diskImageFuns:
diskImageFuns.fedora18i386) 60;
rpm_fedora18x86_64 = makeRPM_x86_64 (diskImageFunsFun:
diskImageFunsFun.fedora18x86_64) 60;
rpm_fedora19i386 = makeRPM_i686 (diskImageFuns:
diskImageFuns.fedora19i386) 70;
@@ -194,6 +196,10 @@ let
deb_debian7i386 = makeDeb_i686 (diskImageFuns: diskImageFuns.debian7i386)
60;
deb_debian7x86_64 = makeDeb_x86_64 (diskImageFunsFun:
diskImageFunsFun.debian7x86_64) 60;
+ deb_ubuntu1110i386 = makeDeb_i686 (diskImageFuns:
diskImageFuns.ubuntu1110i386) 60;
+ deb_ubuntu1110x86_64 = makeDeb_x86_64 (diskImageFuns:
diskImageFuns.ubuntu1110x86_64) 60;
+ deb_ubuntu1204i386 = makeDeb_i686 (diskImageFuns:
diskImageFuns.ubuntu1204i386) 60;
+ deb_ubuntu1204x86_64 = makeDeb_x86_64 (diskImageFuns:
diskImageFuns.ubuntu1204x86_64) 60;
deb_ubuntu1210i386 = makeDeb_i686 (diskImageFuns:
diskImageFuns.ubuntu1210i386) 70;
deb_ubuntu1210x86_64 = makeDeb_x86_64 (diskImageFuns:
diskImageFuns.ubuntu1210x86_64) 70;
deb_ubuntu1304i386 = makeDeb_i686 (diskImageFuns:
diskImageFuns.ubuntu1304i386) 80;
diff --git a/src/libutil/types.hh b/src/libutil/types.hh
index 58e7c8a..906a959 100644
--- a/src/libutil/types.hh
+++ b/src/libutil/types.hh
@@ -39,7 +39,8 @@ protected:
public:
unsigned int status; // exit status
BaseError(const FormatOrString & fs, unsigned int status = 1);
- const char * what() const noexcept { return err.c_str(); }
+ ~BaseError() throw () { };
+ const char * what() const throw () { return err.c_str(); }
const string & msg() const { return err; }
const string & prefix() const { return prefix_; }
BaseError & addPrefix(const FormatOrString & fs);
- 296/376: Disable vacuuming the DB after garbage collection, (continued)
- 296/376: Disable vacuuming the DB after garbage collection, Ludovic Courtès, 2015/01/28
- 298/376: Fix bad operator, Ludovic Courtès, 2015/01/28
- 270/376: Revert "Temporarily disable darwin builds while hydra's darwin is borked", Ludovic Courtès, 2015/01/28
- 283/376: Doh, Ludovic Courtès, 2015/01/28
- 300/376: import derivation: cleanup, Ludovic Courtès, 2015/01/28
- 264/376: Temporarily disable darwin builds while hydra's darwin is borked, Ludovic Courtès, 2015/01/28
- 291/376: Fix message, Ludovic Courtès, 2015/01/28
- 273/376: Fix more warnings, Ludovic Courtès, 2015/01/28
- 258/376: Fix nix-copy-closure --from, Ludovic Courtès, 2015/01/28
- 260/376: Drop support for pre-c++11 compilers., Ludovic Courtès, 2015/01/28
- 262/376: Revert "Drop support for pre-c++11 compilers.",
Ludovic Courtès <=
- 263/376: Fix build on gcc < 4.7, Ludovic Courtès, 2015/01/28
- 244/376: Show total allocations, Ludovic Courtès, 2015/01/28
- 293/376: Remove Hydra build product, Ludovic Courtès, 2015/01/28
- 279/376: Add a launchd configuration file to run nix-daemon, Ludovic Courtès, 2015/01/28
- 251/376: nix-channel --add: Validate URL / channel ID, Ludovic Courtès, 2015/01/28
- 252/376: Remove redundant space in usage errors, Ludovic Courtès, 2015/01/28
- 290/376: realiseContext: Handle all context types, Ludovic Courtès, 2015/01/28
- 276/376: Improve error message if the daemon worker fails to start, Ludovic Courtès, 2015/01/28
- 267/376: Remove comments claiming we use a private PID namespace, Ludovic Courtès, 2015/01/28
- 237/376: Don't recompile the same regex over and over, Ludovic Courtès, 2015/01/28