Browse Source

Trade: alright, fine, I won't push straight to master ever again!

Every time I push an innocent change it ends up breaking the
non-deprecated build, such as 34a91cf458.
Sigh, I really need to clean up the backwards compatibility ifdefs...
pull/601/head
Vladimír Vondruš 3 years ago
parent
commit
4aee7e0d2c
  1. 2
      src/Magnum/Trade/SceneData.h

2
src/Magnum/Trade/SceneData.h

@ -31,6 +31,7 @@
#include <Corrade/Containers/Array.h> #include <Corrade/Containers/Array.h>
#include <Corrade/Containers/StridedArrayView.h> #include <Corrade/Containers/StridedArrayView.h>
#include <Corrade/Utility/Macros.h> /* CORRADE_UNUSED */
#include "Magnum/Trade/Data.h" #include "Magnum/Trade/Data.h"
#include "Magnum/Trade/Trade.h" #include "Magnum/Trade/Trade.h"
@ -38,7 +39,6 @@
#ifdef MAGNUM_BUILD_DEPRECATED #ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/StlForwardVector.h> #include <Corrade/Utility/StlForwardVector.h>
#include <Corrade/Utility/Macros.h>
#endif #endif
namespace Magnum { namespace Trade { namespace Magnum { namespace Trade {

Loading…
Cancel
Save