Merge pull request #123 from HeroesGrave/master

Updated to latest Rust
This commit is contained in:
Brendan Zabarauskas 2014-08-30 23:32:13 +10:00
commit 9ade4ce92d
2 changed files with 2 additions and 2 deletions

View file

@ -13,6 +13,6 @@ authors = ["Brendan Zabarauskas <bjzaba@yahoo.com.au>",
"Tomasz Stachowiak"
]
[[lib]]
[lib]
name = "cgmath"

View file

@ -46,7 +46,7 @@ pub trait Array1<Element: Copy>: Index<uint, Element> + IndexMut<uint, Element>
}
/// A column-major array
pub trait Array2<Column: Array1<Element>, Row: Array1<Element>, Element: Copy>:
pub trait Array2<Column: Array1<Element>+'static, Row: Array1<Element>, Element: Copy>:
Index<uint, Column> + IndexMut<uint, Column> {
/// Get the pointer to the first element of the array.
fn ptr<'a>(&'a self) -> &'a Element {