Revert "Drop support for pre-c++11 compilers."

The breakage this fixed can be worked around without removing support. This reverts commit 84a13dc.
NixOS · Oct 20, 2014 · f040159 · f040159
1 parent ecc2c8f
commit f040159
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);