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

fix ambiguous call to boost::bind (with VS 2012, Boost 1.55)

release/4.3a0
cbeall3 2015-01-20 14:48:09 -05:00
parent d623f80719
commit 37460d4bba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtsam/inference/LabeledSymbol.cpp
View File

@ -110,16 +110,16 @@ bool LabeledSymbol::operator!=(gtsam::Key comp) const {
static LabeledSymbol make(gtsam::Key key) { return LabeledSymbol(key);} static LabeledSymbol make(gtsam::Key key) { return LabeledSymbol(key);}
boost::function<bool(gtsam::Key)> LabeledSymbol::TypeTest(unsigned char c) { boost::function<bool(gtsam::Key)> LabeledSymbol::TypeTest(unsigned char c) {
return bind(&LabeledSymbol::chr, bind(make, _1)) == c; return boost::bind(&LabeledSymbol::chr, boost::bind(make, _1)) == c;
} }
boost::function<bool(gtsam::Key)> LabeledSymbol::LabelTest(unsigned char label) { boost::function<bool(gtsam::Key)> LabeledSymbol::LabelTest(unsigned char label) {
return bind(&LabeledSymbol::label, bind(make, _1)) == label; return boost::bind(&LabeledSymbol::label, boost::bind(make, _1)) == label;
} }
boost::function<bool(gtsam::Key)> LabeledSymbol::TypeLabelTest(unsigned char c, unsigned char label) { boost::function<bool(gtsam::Key)> LabeledSymbol::TypeLabelTest(unsigned char c, unsigned char label) {
return bind(&LabeledSymbol::chr, bind(make, _1)) == c && return boost::bind(&LabeledSymbol::chr, boost::bind(make, _1)) == c &&
bind(&LabeledSymbol::label, bind(make, _1)) == label; boost::bind(&LabeledSymbol::label, boost::bind(make, _1)) == label;
} }
/* ************************************************************************* */ /* ************************************************************************* */