From 02f679e91c87e7949ff3ba010f6b9e90a9eb9f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 11 Apr 2022 10:02:35 +0200
Subject: [PATCH] Revert "Trade: expand SceneConverterFeature to 64 bits."

Shouldn't have gone to master yet, sorry.

This reverts commit ee983fd0988c439b8e16931ef0bb1896aa0a496c.
---
 src/Magnum/Trade/AbstractSceneConverter.cpp        |  2 +-
 src/Magnum/Trade/AbstractSceneConverter.h          |  2 +-
 .../Trade/Test/AbstractSceneConverterTest.cpp      | 14 +++-----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/Magnum/Trade/AbstractSceneConverter.cpp b/src/Magnum/Trade/AbstractSceneConverter.cpp
index dddd701fc..ccbf4980c 100644
--- a/src/Magnum/Trade/AbstractSceneConverter.cpp
+++ b/src/Magnum/Trade/AbstractSceneConverter.cpp
@@ -217,7 +217,7 @@ Debug& operator<<(Debug& debug, const SceneConverterFeature value) {
         /* LCOV_EXCL_STOP */
     }
 
-    return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedLong(value)) << Debug::nospace << ")";
+    return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
 }
 
 Debug& operator<<(Debug& debug, const SceneConverterFeatures value) {
diff --git a/src/Magnum/Trade/AbstractSceneConverter.h b/src/Magnum/Trade/AbstractSceneConverter.h
index e3fdf68f4..14d03ad4d 100644
--- a/src/Magnum/Trade/AbstractSceneConverter.h
+++ b/src/Magnum/Trade/AbstractSceneConverter.h
@@ -53,7 +53,7 @@ namespace Magnum { namespace Trade {
 
 @see @ref SceneConverterFeatures, @ref AbstractSceneConverter::features()
 */
-enum class SceneConverterFeature: UnsignedLong {
+enum class SceneConverterFeature: UnsignedByte {
     /**
      * Convert a mesh with
      * @ref AbstractSceneConverter::convert(const MeshData&).
diff --git a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp
index ff5b155b6..792311bed 100644
--- a/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp
+++ b/src/Magnum/Trade/Test/AbstractSceneConverterTest.cpp
@@ -190,7 +190,7 @@ void AbstractSceneConverterTest::thingNotSupported() {
     struct: AbstractSceneConverter {
         SceneConverterFeatures doFeatures() const override {
             /* Assuming this bit is unused */
-            return SceneConverterFeature(1ull << 63);
+            return SceneConverterFeature(1 << 7);
         }
     } converter;
 
@@ -582,16 +582,8 @@ void AbstractSceneConverterTest::convertMeshToFileNotImplemented() {
 void AbstractSceneConverterTest::debugFeature() {
     std::ostringstream out;
 
-    Debug{&out} << SceneConverterFeature::ConvertMeshInPlace << SceneConverterFeature(0xbafabafadeaddead);
-    {
-        #ifdef CORRADE_TARGET_32BIT
-        CORRADE_EXPECT_FAIL("Debug has shitty hex printing currently, using just the low 32 bits on 32-bit platforms.");
-        #endif
-        CORRADE_COMPARE(out.str(), "Trade::SceneConverterFeature::ConvertMeshInPlace Trade::SceneConverterFeature(0xbafabafadeaddead)\n");
-    }
-    #ifdef CORRADE_TARGET_32BIT
-    CORRADE_COMPARE(out.str(), "Trade::SceneConverterFeature::ConvertMeshInPlace Trade::SceneConverterFeature(0xdeaddead)\n");
-    #endif
+    Debug{&out} << SceneConverterFeature::ConvertMeshInPlace << SceneConverterFeature(0xf0);
+    CORRADE_COMPARE(out.str(), "Trade::SceneConverterFeature::ConvertMeshInPlace Trade::SceneConverterFeature(0xf0)\n");
 }
 
 void AbstractSceneConverterTest::debugFeatures() {