diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2017-02-06 16:50:07 +0000 |
|---|---|---|
| committer | Shlomi Fish <shlomif@shlomifish.org> | 2017-02-06 16:50:07 +0000 |
| commit | 1232596134bcba8d19f2809ffdc84e3b5c33d3b3 (patch) | |
| tree | 2fcb91d6fe9ef47a85ba3f73be10dc5dc7ee10a4 /src/inkgc | |
| parent | Merged. (diff) | |
| parent | Remove some unneeded < C++11 fallback code (diff) | |
| download | inkscape-1232596134bcba8d19f2809ffdc84e3b5c33d3b3.tar.gz inkscape-1232596134bcba8d19f2809ffdc84e3b5c33d3b3.zip | |
Merged.
(bzr r15369.1.18)
Diffstat (limited to 'src/inkgc')
| -rw-r--r-- | src/inkgc/gc-core.h | 6 | ||||
| -rw-r--r-- | src/inkgc/gc-managed.h | 2 | ||||
| -rw-r--r-- | src/inkgc/gc.cpp | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/inkgc/gc-core.h b/src/inkgc/gc-core.h index d9d0bf4ff..a27510f50 100644 --- a/src/inkgc/gc-core.h +++ b/src/inkgc/gc-core.h @@ -18,7 +18,7 @@ #include <new> #include <cstdlib> -#include <cstddef> + #ifdef HAVE_GC_GC_H # include <gc/gc.h> #else @@ -137,7 +137,6 @@ inline void *operator new(std::size_t size, Inkscape::GC::CollectionPolicy collect, Inkscape::GC::CleanupFunc cleanup=NULL, void *data=NULL) -throw(std::bad_alloc) { using namespace Inkscape::GC; @@ -168,7 +167,6 @@ inline void *operator new(std::size_t size, Inkscape::GC::ScanPolicy scan, Inkscape::GC::CleanupFunc cleanup=NULL, void *data=NULL) -throw(std::bad_alloc) { return operator new(size, scan, Inkscape::GC::AUTO, cleanup, data); } @@ -178,7 +176,6 @@ inline void *operator new[](std::size_t size, Inkscape::GC::CollectionPolicy collect, Inkscape::GC::CleanupFunc cleanup=NULL, void *data=NULL) -throw(std::bad_alloc) { return operator new(size, scan, collect, cleanup, data); } @@ -187,7 +184,6 @@ inline void *operator new[](std::size_t size, Inkscape::GC::ScanPolicy scan, Inkscape::GC::CleanupFunc cleanup=NULL, void *data=NULL) -throw(std::bad_alloc) { return operator new[](size, scan, Inkscape::GC::AUTO, cleanup, data); } diff --git a/src/inkgc/gc-managed.h b/src/inkgc/gc-managed.h index f435d7802..97b2b816e 100644 --- a/src/inkgc/gc-managed.h +++ b/src/inkgc/gc-managed.h @@ -30,7 +30,6 @@ public: void *operator new(std::size_t size, ScanPolicy scan=default_scan, CollectionPolicy collect=default_collect) - throw (std::bad_alloc) { return ::operator new(size, scan, collect); } @@ -38,7 +37,6 @@ public: void *operator new[](std::size_t size, ScanPolicy scan=default_scan, CollectionPolicy collect=default_collect) - throw (std::bad_alloc) { return ::operator new[](size, scan, collect); } diff --git a/src/inkgc/gc.cpp b/src/inkgc/gc.cpp index ffa94ea2a..b1bd07af6 100644 --- a/src/inkgc/gc.cpp +++ b/src/inkgc/gc.cpp @@ -173,7 +173,7 @@ public: {} }; -Ops const &get_ops() throw (InvalidGCModeError) { +Ops const &get_ops() { char *mode_string=std::getenv("_INKSCAPE_GC"); if (mode_string) { if (!std::strcmp(mode_string, "enable")) { |