Browse Source

Various Array-related cleanup.

pull/277/head
Vladimír Vondruš 13 years ago
parent
commit
62bc46ea78
  1. 2
      src/Array.h
  2. 10
      src/Test/ArrayTest.cpp

2
src/Array.h

@ -53,7 +53,7 @@ template<UnsignedInt dimensions, class T> class Array {
/** /**
* @brief Default constructor * @brief Default constructor
* *
* Sets all components to their default-constructed values * Sets all components to their default-constructed values.
*/ */
constexpr /*implicit*/ Array(): _data() {} constexpr /*implicit*/ Array(): _data() {}

10
src/Test/ArrayTest.cpp

@ -37,9 +37,9 @@ class ArrayTest: public TestSuite::Tester {
void access(); void access();
}; };
typedef Magnum::Array1D<int> Array1D; typedef Magnum::Array1D<Int> Array1D;
typedef Magnum::Array2D<int> Array2D; typedef Magnum::Array2D<Int> Array2D;
typedef Magnum::Array3D<int> Array3D; typedef Magnum::Array3D<Int> Array3D;
ArrayTest::ArrayTest() { ArrayTest::ArrayTest() {
addTests({&ArrayTest::construct, addTests({&ArrayTest::construct,
@ -71,8 +71,8 @@ void ArrayTest::construct() {
} }
void ArrayTest::equality() { void ArrayTest::equality() {
CORRADE_VERIFY((Array<3, int>(5, 6, 7) == Array<3, int>(5, 6, 7))); CORRADE_VERIFY((Array<3, Int>(5, 6, 7) == Array<3, Int>(5, 6, 7)));
CORRADE_VERIFY((Array<3, int>(5, 6, 7) != Array<3, int>(5, 6, 8))); CORRADE_VERIFY((Array<3, Int>(5, 6, 7) != Array<3, Int>(5, 6, 8)));
} }
void ArrayTest::access() { void ArrayTest::access() {

Loading…
Cancel
Save