From bd5825954f2e5801197f448c24660eda04fda5f4 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 9 Aug 2015 16:04:56 -1000 Subject: [PATCH] FourCC type addition --- hecl/extern/Athena | 2 +- hecl/extern/RetroCommon | 2 +- hecl/include/HECL/HECL.hpp | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hecl/extern/Athena b/hecl/extern/Athena index 9f0cb1327..f49a6a6e8 160000 --- a/hecl/extern/Athena +++ b/hecl/extern/Athena @@ -1 +1 @@ -Subproject commit 9f0cb1327bad28ca727f1181baeba99cc1f3b7d9 +Subproject commit f49a6a6e82b3bbca4006eddfdae7ccadae9ed4d4 diff --git a/hecl/extern/RetroCommon b/hecl/extern/RetroCommon index 2d18e95a9..99bb5df7f 160000 --- a/hecl/extern/RetroCommon +++ b/hecl/extern/RetroCommon @@ -1 +1 @@ -Subproject commit 2d18e95a91e17d1352d2779c71d01da4155a164e +Subproject commit 99bb5df7f3457de0953723188ffa5cecbc40a1fd diff --git a/hecl/include/HECL/HECL.hpp b/hecl/include/HECL/HECL.hpp index db5e086f4..c5ab112cf 100644 --- a/hecl/include/HECL/HECL.hpp +++ b/hecl/include/HECL/HECL.hpp @@ -317,12 +317,17 @@ public: {num = other.num;} FourCC(const char* name) : num(*(uint32_t*)name) {} + FourCC(uint32_t n) + : num(n) {} inline bool operator==(const FourCC& other) const {return num == other.num;} inline bool operator!=(const FourCC& other) const {return num != other.num;} inline bool operator==(const char* other) const {return num == *(uint32_t*)other;} inline bool operator!=(const char* other) const {return num != *(uint32_t*)other;} + inline bool operator==(uint32_t other) const {return num == other;} + inline bool operator!=(uint32_t other) const {return num != other;} inline std::string toString() const {return std::string(fcc, 4);} inline uint32_t toUint32() const {return num;} + inline operator uint32_t() const {return num;} }; /**