drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[nostalgia/core] Add missing nodiscards and noexcepts

Browse Source
This commit is contained in:
Gary Talent 2021-04-20 23:19:42 -05:00
parent 4814b4f5cc
commit 863437fb10
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/core/color.hpp
View File

@ -92,7 +92,7 @@ constexpr uint8_t blue32(Color32 c) noexcept {
[[nodiscard]] [[nodiscard]]
constexpr Color16 color16(uint8_t r, uint8_t g, uint8_t b) { constexpr Color16 color16(uint8_t r, uint8_t g, uint8_t b) noexcept {
return r | (g << 5) | (b << 10); return r | (g << 5) | (b << 10);
} }

2
src/nostalgia/core/context.hpp
View File

@ -26,6 +26,7 @@ class Context {
} }
template<typename T> template<typename T>
[[nodiscard]]
constexpr T *windowerData() noexcept { constexpr T *windowerData() noexcept {
return static_cast<T*>(m_windowerData); return static_cast<T*>(m_windowerData);
} }
@ -35,6 +36,7 @@ class Context {
} }
template<typename T> template<typename T>
[[nodiscard]]
constexpr T *rendererData() noexcept { constexpr T *rendererData() noexcept {
return static_cast<T*>(m_rendererData); return static_cast<T*>(m_rendererData);
} }

4
src/nostalgia/core/gba/gfx.cpp
View File

@ -44,7 +44,7 @@ struct GbaTileMapTarget {
}; };
template<typename T> template<typename T>
ox::Error modelRead(T *io, GbaPaletteTarget *t) { ox::Error modelRead(T *io, GbaPaletteTarget *t) noexcept {
io->template setTypeInfo<GbaPaletteTarget>(); io->template setTypeInfo<GbaPaletteTarget>();
const auto colorHandler = [t](std::size_t i, Color16 *c) { const auto colorHandler = [t](std::size_t i, Color16 *c) {
t->palette[i] = *c; t->palette[i] = *c;
@ -54,7 +54,7 @@ ox::Error modelRead(T *io, GbaPaletteTarget *t) {
} }
template<typename T> template<typename T>
ox::Error modelRead(T *io, GbaTileMapTarget *t) { ox::Error modelRead(T *io, GbaTileMapTarget *t) noexcept {
io->template setTypeInfo<GbaTileMapTarget>(); io->template setTypeInfo<GbaTileMapTarget>();
uint8_t bpp; uint8_t bpp;
int dummy; int dummy;

4
src/nostalgia/core/gfx.hpp
View File

@ -44,14 +44,14 @@ struct NostalgiaGraphic {
}; };
template<typename T> template<typename T>
constexpr ox::Error model(T *io, NostalgiaPalette *pal) { constexpr ox::Error model(T *io, NostalgiaPalette *pal) noexcept {
io->template setTypeInfo<NostalgiaPalette>(); io->template setTypeInfo<NostalgiaPalette>();
oxReturnError(io->field("colors", &pal->colors)); oxReturnError(io->field("colors", &pal->colors));
return OxError(0); return OxError(0);
} }
template<typename T> template<typename T>
constexpr ox::Error model(T *io, NostalgiaGraphic *ng) { constexpr ox::Error model(T *io, NostalgiaGraphic *ng) noexcept {
io->template setTypeInfo<NostalgiaGraphic>(); io->template setTypeInfo<NostalgiaGraphic>();
oxReturnError(io->field("bpp", &ng->bpp)); oxReturnError(io->field("bpp", &ng->bpp));
oxReturnError(io->field("rows", &ng->rows)); oxReturnError(io->field("rows", &ng->rows));