From 1aac14d05918ef0cff927579e125577498d03a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 18 Apr 2013 11:34:02 +0200 Subject: [PATCH] Using CORRADE_ASSERT_UNREACHABLE() instead of CORRADE_ASSERT(false). --- src/AbstractFramebuffer.cpp | 2 +- src/AbstractImage.cpp | 4 ++-- src/AbstractShaderProgram.cpp | 8 ++++---- src/Color.h | 2 +- src/Implementation/BufferState.cpp | 2 +- src/Mesh.cpp | 2 +- src/Shader.cpp | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/AbstractFramebuffer.cpp b/src/AbstractFramebuffer.cpp index 6fd62aab8..7c353bcbd 100644 --- a/src/AbstractFramebuffer.cpp +++ b/src/AbstractFramebuffer.cpp @@ -62,7 +62,7 @@ void AbstractFramebuffer::bindInternal(Target target) { } else if(target == Target::ReadDraw) { if(state->readBinding == _id && state->drawBinding == _id) return; state->readBinding = state->drawBinding = _id; - } else CORRADE_INTERNAL_ASSERT(false); + } else CORRADE_ASSERT_UNREACHABLE(); glBindFramebuffer(static_cast(target), _id); } diff --git a/src/AbstractImage.cpp b/src/AbstractImage.cpp index c7bd56b2d..761f15dd8 100644 --- a/src/AbstractImage.cpp +++ b/src/AbstractImage.cpp @@ -129,10 +129,10 @@ std::size_t AbstractImage::pixelSize(Format format, Type type) { case Format::StencilIndex: #endif case Format::DepthStencil: - CORRADE_INTERNAL_ASSERT(false); + CORRADE_ASSERT_UNREACHABLE(); } - CORRADE_INTERNAL_ASSERT(false); + CORRADE_ASSERT_UNREACHABLE(); return 0; } diff --git a/src/AbstractShaderProgram.cpp b/src/AbstractShaderProgram.cpp index afef65c5e..bd5c52273 100644 --- a/src/AbstractShaderProgram.cpp +++ b/src/AbstractShaderProgram.cpp @@ -600,7 +600,7 @@ std::size_t FloatAttribute::size(GLint components, DataType dataType) { #endif } - CORRADE_INTERNAL_ASSERT(false); + CORRADE_ASSERT_UNREACHABLE(); return 0; } @@ -618,7 +618,7 @@ std::size_t IntAttribute::size(GLint components, DataType dataType) { return 4*components; } - CORRADE_INTERNAL_ASSERT(false); + CORRADE_ASSERT_UNREACHABLE(); return 0; } #endif @@ -630,7 +630,7 @@ std::size_t DoubleAttribute::size(GLint components, DataType dataType) { return 8*components; } - CORRADE_INTERNAL_ASSERT(false); + CORRADE_ASSERT_UNREACHABLE(); return 0; } #endif @@ -665,7 +665,7 @@ std::size_t Attribute>::size(GLint components, DataType d #endif } - CORRADE_INTERNAL_ASSERT(false); + CORRADE_ASSERT_UNREACHABLE(); return 0; } diff --git a/src/Color.h b/src/Color.h index 74b634d84..f6b06325d 100644 --- a/src/Color.h +++ b/src/Color.h @@ -63,7 +63,7 @@ template inline typename std::enable_if::valu case 3: return {p, q, value}; case 4: return {t, p, value}; case 5: return {value, p, q}; - default: CORRADE_INTERNAL_ASSERT(false); + default: CORRADE_ASSERT_UNREACHABLE(); } } template inline typename std::enable_if::value, Color3>::type fromHSV(typename Color3::HSV hsv) { diff --git a/src/Implementation/BufferState.cpp b/src/Implementation/BufferState.cpp index 15ecc9a9e..e844f8991 100644 --- a/src/Implementation/BufferState.cpp +++ b/src/Implementation/BufferState.cpp @@ -71,7 +71,7 @@ std::size_t BufferState::indexForTarget(Buffer::Target target) { #endif } - CORRADE_INTERNAL_ASSERT(false); + CORRADE_ASSERT_UNREACHABLE(); } }} diff --git a/src/Mesh.cpp b/src/Mesh.cpp index d94e4d1a2..475f869f1 100644 --- a/src/Mesh.cpp +++ b/src/Mesh.cpp @@ -55,7 +55,7 @@ std::size_t Mesh::indexSize(IndexType type) { case IndexType::UnsignedInt: return 4; } - CORRADE_INTERNAL_ASSERT(false); + CORRADE_ASSERT_UNREACHABLE(); } Mesh::Mesh(Primitive primitive): _primitive(primitive), _vertexCount(0), _indexCount(0) diff --git a/src/Shader.cpp b/src/Shader.cpp index 741d2b3c3..64e3679e5 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -59,7 +59,7 @@ Shader::Shader(Version version, Type type): _type(type), _state(State::Initializ CORRADE_ASSERT(false, "Shader::Shader(): unsupported version" << version, ); } - CORRADE_INTERNAL_ASSERT(false); + CORRADE_ASSERT_UNREACHABLE(); } Shader::Shader(Shader&& other): _type(other._type), _state(other._state), sources(other.sources), shader(other.shader) {