Merge branch 'master' of github.com:emjotde/Marian

This commit is contained in:
Tomasz Dwojak 2016-09-14 23:12:01 +01:00
commit 0768c5058b

View File

@ -178,12 +178,12 @@ class Tensor {
return pimpl_->begin();
}
auto end() -> decltype( pimpl_->begin() ) {
return pimpl_->begin();
auto end() -> decltype( pimpl_->end() ) {
return pimpl_->end();
}
auto end() const -> decltype( pimpl_->begin() ) {
return pimpl_->begin();
auto end() const -> decltype( pimpl_->end() ) {
return pimpl_->end();
}
const Shape& shape() const {