Browse Source

Various code cleanup.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
dd788285dc
  1. 2
      src/Math/Vector.h
  2. 2
      src/Test/ResourceManagerTest.cpp

2
src/Math/Vector.h

@ -166,7 +166,7 @@ template<std::size_t size, class T> class Vector {
template<class U, class V = decltype(Implementation::VectorConverter<size, T, U>::from(std::declval<U>()))> inline constexpr explicit Vector(const U& other): Vector(Implementation::VectorConverter<size, T, U>::from(other)) {} template<class U, class V = decltype(Implementation::VectorConverter<size, T, U>::from(std::declval<U>()))> inline constexpr explicit Vector(const U& other): Vector(Implementation::VectorConverter<size, T, U>::from(other)) {}
#else #else
template<class U, class V = decltype(Implementation::VectorConverter<size, T, U>::from(std::declval<U>()))> inline explicit Vector(const U& other) { template<class U, class V = decltype(Implementation::VectorConverter<size, T, U>::from(std::declval<U>()))> inline explicit Vector(const U& other) {
*this = Vector(Implementation::VectorConverter<size, T, U>::from(other)); *this = Implementation::VectorConverter<size, T, U>::from(other);
} }
#endif #endif

2
src/Test/ResourceManagerTest.cpp

@ -59,7 +59,7 @@ typedef Magnum::ResourceManager<Int, Data> ResourceManager;
class IntResourceLoader: public AbstractResourceLoader<Int> { class IntResourceLoader: public AbstractResourceLoader<Int> {
public: public:
void load(ResourceKey key) override { void load(ResourceKey key) override {
AbstractResourceLoader::load(key); AbstractResourceLoader<Int>::load(key);
} }
void load() { void load() {

Loading…
Cancel
Save