summaryrefslogtreecommitdiffstats
path: root/src/inkgc
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2017-02-05 16:04:35 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2017-02-05 16:04:35 +0000
commit349536d49558ec5841e799eb33a4cbbb3fa9722d (patch)
tree7e6a4cb6e7ecff3a3d81e99a8c3c3a246839a195 /src/inkgc
parentCMake: Supress status messages for install target on Windows (considerably sp... (diff)
downloadinkscape-349536d49558ec5841e799eb33a4cbbb3fa9722d.tar.gz
inkscape-349536d49558ec5841e799eb33a4cbbb3fa9722d.zip
Fix C++11 errors and warnings with g++-7
Fixed bugs: - https://launchpad.net/bugs/1660992 (bzr r15477)
Diffstat (limited to 'src/inkgc')
-rw-r--r--src/inkgc/gc-core.h6
-rw-r--r--src/inkgc/gc-managed.h2
-rw-r--r--src/inkgc/gc.cpp2
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")) {