diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-09-03 21:31:31 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-09-03 21:31:31 +0000 |
| commit | 4e474d44ed34634ddbebe61ca69c140f8f899618 (patch) | |
| tree | 02f2ef9db7b0627d3ded4a17a14413d6940ec748 /src/axis-manip.h | |
| parent | undo some things from rev 13530, to fix compile with gcc 4.9.0 -Werror=return... (diff) | |
| download | inkscape-4e474d44ed34634ddbebe61ca69c140f8f899618.tar.gz inkscape-4e474d44ed34634ddbebe61ca69c140f8f899618.zip | |
remove glib dependency, but add return statements to help compiler and prevent return-type warnings
(bzr r13341.1.195)
Diffstat (limited to 'src/axis-manip.h')
| -rw-r--r-- | src/axis-manip.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/axis-manip.h b/src/axis-manip.h index 70cdb557e..5e245939e 100644 --- a/src/axis-manip.h +++ b/src/axis-manip.h @@ -15,7 +15,6 @@ #include <cassert> #include <string> #include <utility> -#include <glib.h> namespace Proj { @@ -79,18 +78,15 @@ inline int axis_to_int(Box3D::Axis axis) { switch (axis) { case Box3D::X: return 0; - break; case Box3D::Y: return 1; - break; case Box3D::Z: return 2; - break; case Box3D::NONE: return -1; - break; default: assert(false); + return -1; // help compiler's flow analysis (-Werror=return-value) } } @@ -105,7 +101,8 @@ inline Proj::Axis toProj(Box3D::Axis axis) { case Box3D::NONE: return Proj::NONE; default: - g_assert_not_reached(); + assert(false); + return Proj::NONE; // help compiler's flow analysis (-Werror=return-value) } } @@ -128,7 +125,8 @@ inline Box3D::Axis toAffine(Proj::Axis axis) { case Proj::NONE: return Box3D::NONE; default: - g_assert_not_reached(); + assert(false); + return Box3D::NONE; // help compiler's flow analysis (-Werror=return-value) } } |