summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-05-05 14:11:11 +0200
committerKonstantin Käfer <mail@kkaefer.com>2017-05-05 14:42:47 +0200
commitfd104dd3c229ce42d149a143260407cd259b716c (patch)
treecae0f95069a0b4a0437412c2e5d7dbd796f1792f
parentbf959b9d866b20b5563bd748313a10f9804b03c1 (diff)
downloadqtlocation-mapboxgl-fd104dd3c229ce42d149a143260407cd259b716c.tar.gz
[core] Throw exceptions by value
-rw-r--r--platform/android/src/style/layers/unknown_layer.cpp2
-rw-r--r--platform/android/src/style/sources/unknown_source.cpp2
-rw-r--r--src/mbgl/gl/context.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/src/style/layers/unknown_layer.cpp b/platform/android/src/style/layers/unknown_layer.cpp
index 9ec963a41b..8ffda82bfc 100644
--- a/platform/android/src/style/layers/unknown_layer.cpp
+++ b/platform/android/src/style/layers/unknown_layer.cpp
@@ -6,7 +6,7 @@ namespace {
// Dummy initializer (We don't support initializing this from the JVM)
std::unique_ptr<mbgl::android::UnknownLayer> init(jni::JNIEnv&) {
- throw new std::runtime_error("UnknownLayer should not be initialized from the JVM");
+ throw std::runtime_error("UnknownLayer should not be initialized from the JVM");
}
} // namespace
diff --git a/platform/android/src/style/sources/unknown_source.cpp b/platform/android/src/style/sources/unknown_source.cpp
index c1b1cc8c02..86736597c3 100644
--- a/platform/android/src/style/sources/unknown_source.cpp
+++ b/platform/android/src/style/sources/unknown_source.cpp
@@ -4,7 +4,7 @@ namespace {
// Dummy initializer (We don't support initializing this from the JVM)
std::unique_ptr<mbgl::android::UnknownSource> init(jni::JNIEnv&) {
- throw new std::runtime_error("UnknownSource should not be initialized from the JVM");
+ throw std::runtime_error("UnknownSource should not be initialized from the JVM");
}
} // namespace
diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp
index 1a5a6a2289..3ab1260d27 100644
--- a/src/mbgl/gl/context.cpp
+++ b/src/mbgl/gl/context.cpp
@@ -341,7 +341,7 @@ Framebuffer
Context::createFramebuffer(const Renderbuffer<RenderbufferType::RGBA>& color,
const Renderbuffer<RenderbufferType::DepthStencil>& depthStencil) {
if (color.size != depthStencil.size) {
- throw new std::runtime_error("Renderbuffer size mismatch");
+ throw std::runtime_error("Renderbuffer size mismatch");
}
auto fbo = createFramebuffer();
bindFramebuffer = fbo;
@@ -365,7 +365,7 @@ Framebuffer
Context::createFramebuffer(const Texture& color,
const Renderbuffer<RenderbufferType::DepthStencil>& depthStencil) {
if (color.size != depthStencil.size) {
- throw new std::runtime_error("Renderbuffer size mismatch");
+ throw std::runtime_error("Renderbuffer size mismatch");
}
auto fbo = createFramebuffer();
bindFramebuffer = fbo;