Browse Source

Trade: c'mon, old compilers.

meshdata-cereal-killer
Vladimír Vondruš 6 years ago
parent
commit
c653cf3497
  1. 3
      doc/snippets/MagnumTrade.cpp
  2. 3
      src/Magnum/Trade/sceneconverter.cpp

3
doc/snippets/MagnumTrade.cpp

@ -65,6 +65,8 @@ using namespace Magnum::Math::Literals;
int main() { int main() {
/* GCC 4.8 and Clang 3.8 has problems with an implicit cast here */
#if (defined(CORRADE_TARGET_UNIX) || (defined(CORRADE_TARGET_WINDOWS) && !defined(CORRADE_TARGET_WINDOWS_RT))) && (!defined(CORRADE_TARGET_GCC) || __GNUC__ > 5 || (!defined(CORRADE_TARGET_APPLE_CLANG) && __clang_major__ >= 4) || (defined(CORRADE_TARGET_APPLE_CLANG) && __clang_major__ >= 9))
{ {
/* [blob-deserialize-mesh] */ /* [blob-deserialize-mesh] */
Containers::Array<const char, Utility::Directory::MapDeleter> blob = Containers::Array<const char, Utility::Directory::MapDeleter> blob =
@ -77,6 +79,7 @@ if(!spaceship) Fatal{} << "oh no";
// ... // ...
/* [blob-deserialize-mesh] */ /* [blob-deserialize-mesh] */
} }
#endif
{ {
/* [AbstractImporter-usage] */ /* [AbstractImporter-usage] */

3
src/Magnum/Trade/sceneconverter.cpp

@ -132,7 +132,8 @@ class BlobImporter: public Trade::AbstractImporter {
UnsignedInt doMeshCount() const override { return 1; } UnsignedInt doMeshCount() const override { return 1; }
Containers::Optional<Trade::MeshData> doMesh(UnsignedInt, UnsignedInt) override { Containers::Optional<Trade::MeshData> doMesh(UnsignedInt, UnsignedInt) override {
return Trade::MeshData::deserialize(_in); /* GCC 4.8 and old Clang has problems with an implicit cast here */
return Trade::MeshData::deserialize(Containers::ArrayView<const void>(_in));
} }
Containers::Array<const char, Utility::Directory::MapDeleter> _in; Containers::Array<const char, Utility::Directory::MapDeleter> _in;

Loading…
Cancel
Save