From e3bf8070b5690e3f7c3eb7f36de164c90d54cf4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 5 Dec 2013 17:37:05 +0100 Subject: [PATCH] Don't return after std::abort(). MSVC marks that as unreachable code, which is. --- src/AbstractImage.cpp | 1 - src/AbstractShaderProgram.cpp | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/AbstractImage.cpp b/src/AbstractImage.cpp index d593752a7..4442dad7b 100644 --- a/src/AbstractImage.cpp +++ b/src/AbstractImage.cpp @@ -133,7 +133,6 @@ std::size_t AbstractImage::pixelSize(ColorFormat format, ColorType type) { } CORRADE_ASSERT_UNREACHABLE(); - return 0; } } diff --git a/src/AbstractShaderProgram.cpp b/src/AbstractShaderProgram.cpp index a290dd070..c75ad6386 100644 --- a/src/AbstractShaderProgram.cpp +++ b/src/AbstractShaderProgram.cpp @@ -762,7 +762,6 @@ std::size_t FloatAttribute::size(GLint components, DataType dataType) { } CORRADE_ASSERT_UNREACHABLE(); - return 0; } #ifndef MAGNUM_TARGET_GLES2 @@ -780,7 +779,6 @@ std::size_t IntAttribute::size(GLint components, DataType dataType) { } CORRADE_ASSERT_UNREACHABLE(); - return 0; } #endif @@ -792,7 +790,6 @@ std::size_t DoubleAttribute::size(GLint components, DataType dataType) { } CORRADE_ASSERT_UNREACHABLE(); - return 0; } #endif @@ -827,7 +824,6 @@ std::size_t Attribute>::size(GLint components, DataType d } CORRADE_ASSERT_UNREACHABLE(); - return 0; } Debug operator<<(Debug debug, SizedAttribute<1, 1>::Components value) {