Merge upstream changes.

This commit is contained in:
Bård Skaflestad 2013-05-15 10:12:30 +02:00
parent 9139d8a48b
commit 930b88334f

View File

@ -288,9 +288,6 @@ superset(const Eigen::Array<Scalar, Eigen::Dynamic, 1>& x,
/// elements of d on the diagonal.
/// Need to mark this as inline since it is defined in a header and not a template.
inline
AutoDiff::ForwardBlock<double>::M
spdiag(const AutoDiff::ForwardBlock<double>::V& d);
AutoDiff::ForwardBlock<double>::M
spdiag(const AutoDiff::ForwardBlock<double>::V& d)
{