diff options
| author | Paul Gilbert | 2019-04-14 08:59:39 -0700 |
|---|---|---|
| committer | Paul Gilbert | 2019-04-14 08:59:39 -0700 |
| commit | daffdcea1aa6ddbb8a0212f31626e7d47e5769b9 (patch) | |
| tree | df994449780162eaae9c66b6c46653dd257ba04e | |
| parent | 9a6d62c0c64afc11fc3e20a9c88d64a9412d2fb1 (diff) | |
| download | scummvm-rg350-daffdcea1aa6ddbb8a0212f31626e7d47e5769b9.tar.gz scummvm-rg350-daffdcea1aa6ddbb8a0212f31626e7d47e5769b9.tar.bz2 scummvm-rg350-daffdcea1aa6ddbb8a0212f31626e7d47e5769b9.zip | |
GLK: Fix compiler warnings for dispatch layer
| -rw-r--r-- | engines/glk/glk_dispa.cpp | 6 | ||||
| -rw-r--r-- | engines/glk/glk_types.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/glk/glk_dispa.cpp b/engines/glk/glk_dispa.cpp index cb6dc8d4b9..63d93330b7 100644 --- a/engines/glk/glk_dispa.cpp +++ b/engines/glk/glk_dispa.cpp @@ -340,7 +340,7 @@ uint32 GlkAPI::gidispatch_count_classes() const { } const gidispatch_intconst_t *GlkAPI::gidispatch_get_class(uint32 index) const { - if (index < 0 || index >= NUMCLASSES) + if (index >= NUMCLASSES) return nullptr; return &(class_table[index]); } @@ -350,7 +350,7 @@ uint32 GlkAPI::gidispatch_count_intconst() const { } const gidispatch_intconst_t *GlkAPI::gidispatch_get_intconst(uint32 index) const { - if (index < 0 || index >= NUMINTCONSTANTS) + if (index >= NUMINTCONSTANTS) return nullptr; return &(intconstant_table[index]); } @@ -360,7 +360,7 @@ uint32 GlkAPI::gidispatch_count_functions() const { } gidispatch_function_t *GlkAPI::gidispatch_get_function(uint32 index) const { - if (index < 0 || index >= NUMFUNCTIONS) + if (index >= NUMFUNCTIONS) return nullptr; return &(function_table[index]); } diff --git a/engines/glk/glk_types.h b/engines/glk/glk_types.h index 5058698171..877836293d 100644 --- a/engines/glk/glk_types.h +++ b/engines/glk/glk_types.h @@ -224,7 +224,7 @@ union gidispatch_rock_t { }; union gluniversal_union { - uint32 uint; ///< Iu + uint uint; ///< Iu int32 sint; ///< Is void *opaqueref; ///< Qa, Qb, Qc... byte uch; ///< Cu |