12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed conflict stuff: Jing, why reinterpret_cast ?

release/4.3a0
dellaert 2016-04-10 18:30:24 -07:00
parent 1233a9c9b7
commit f440ac92ff
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/nonlinear/Values-inl.h
View File

@ -292,12 +292,8 @@ namespace gtsam {
Eigen::Matrix<double, -1, 1> operator()(Key j, Eigen::Matrix<double, -1, 1> operator()(Key j,
const gtsam::Value * const pointer) { const gtsam::Value * const pointer) {
try { try {
//<<<<<<< HEAD
// value returns a const Vector&, and the return makes a copy !!!!! // value returns a const Vector&, and the return makes a copy !!!!!
return dynamic_cast<const GenericValue<Eigen::Matrix<double, -1, 1> >&>(*pointer).value(); return dynamic_cast<const GenericValue<Eigen::Matrix<double, -1, 1> >&>(*pointer).value();
//=======
// return reinterpret_cast<const GenericValue<Eigen::Matrix<double, -1, 1> >&>(*pointer).value();
//>>>>>>> feature/FixFixedValues
} catch (std::bad_cast &) { } catch (std::bad_cast &) {
// If a fixed vector was stored, we end up here as well. // If a fixed vector was stored, we end up here as well.
throw ValuesIncorrectType(j, typeid(*pointer), throw ValuesIncorrectType(j, typeid(*pointer),