diff options
| author | Shea Levy <shea@shealevy.com> | 2014-10-19T02·44-0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-10-19T02·44-0400 |
| commit | 84a13dc576496f1227665259c61f86184f452f51 (patch) | |
| tree | db099d777b08c5c7f8fd0e203741d5c7c92e44ab | |
| parent | d16e3c7f091b0ecc4975368575c71d69ce7a9bc7 (diff) | |
Drop support for pre-c++11 compilers.
In particular, gcc 4.6's std::exception::~exception has an exception specification in c++0x mode, which requires us to use that deprecated feature in nix (and led to breakage after some recent changes that were valid c++11). nix already uses several c++11 features and gcc 4.7 has been around for over 2 years.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | release.nix | 6 | ||||
| -rw-r--r-- | src/libutil/types.hh | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/Makefile b/Makefile index b41a820275f4..5ada6030df1a 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ makefiles = \ doc/manual/local.mk \ tests/local.mk -GLOBAL_CXXFLAGS += -std=c++0x -g -Wall +GLOBAL_CXXFLAGS += -std=c++11 -g -Wall include Makefile.config diff --git a/release.nix b/release.nix index e84f49634051..bd90b784d5ad 100644 --- a/release.nix +++ b/release.nix @@ -181,8 +181,6 @@ 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; @@ -196,10 +194,6 @@ 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 906a959e3079..58e7c8a39cbb 100644 --- a/src/libutil/types.hh +++ b/src/libutil/types.hh @@ -39,8 +39,7 @@ protected: public: unsigned int status; // exit status BaseError(const FormatOrString & fs, unsigned int status = 1); - ~BaseError() throw () { }; - const char * what() const throw () { return err.c_str(); } + const char * what() const noexcept { return err.c_str(); } const string & msg() const { return err; } const string & prefix() const { return prefix_; } BaseError & addPrefix(const FormatOrString & fs); |