ktyl
/
basalt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'niko_devel' into 'master' 

Make serialization functions for non-basalt types static.

See merge request basalt/basalt!30
This commit is contained in:
Vladyslav Usenko 2019-08-06 09:28:54 +00:00
parent f958a7480d d8c39a29a5
commit 2d21860d5c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/basalt/io/dataset_io.h
View File

@ -157,7 +157,7 @@ namespace cereal {
template <class Archive, class _Scalar, int _Rows, int _Cols, int _Options, template <class Archive, class _Scalar, int _Rows, int _Cols, int _Options,
int _MaxRows, int _MaxCols> int _MaxRows, int _MaxCols>
inline static inline
typename std::enable_if<_Rows == Eigen::Dynamic || _Cols == Eigen::Dynamic, typename std::enable_if<_Rows == Eigen::Dynamic || _Cols == Eigen::Dynamic,
void>::type void>::type
save(Archive &ar, const Eigen::Matrix<_Scalar, _Rows, _Cols, _Options, save(Archive &ar, const Eigen::Matrix<_Scalar, _Rows, _Cols, _Options,
@ -171,7 +171,7 @@ inline
template <class Archive, class _Scalar, int _Rows, int _Cols, int _Options, template <class Archive, class _Scalar, int _Rows, int _Cols, int _Options,
int _MaxRows, int _MaxCols> int _MaxRows, int _MaxCols>
inline static inline
typename std::enable_if<_Rows == Eigen::Dynamic || _Cols == Eigen::Dynamic, typename std::enable_if<_Rows == Eigen::Dynamic || _Cols == Eigen::Dynamic,
void>::type void>::type
load(Archive &ar, load(Archive &ar,

2
src/io/marg_data_io.cpp
View File

@ -222,7 +222,7 @@ void serialize(Archive& ar, basalt::ImageData& m) {
} }
template <class Archive> template <class Archive>
void serialize(Archive& ar, Eigen::AffineCompact2f& m) { static void serialize(Archive& ar, Eigen::AffineCompact2f& m) {
ar(m.matrix()); ar(m.matrix());
} }
} // namespace cereal } // namespace cereal

2
thirdparty/basalt-headers vendored

@ -1 +1 @@
Subproject commit 12b6290f01aa49c15cfec4d8ed8f347323678297 Subproject commit 2ae558ce2b494d21908391b89cf13df93d0dcfa9