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

fix merge problem 

Argument::isScalar() was moved to Qualified and should be checked via Argument::type
release/4.3a0
Duy-Nguyen Ta 2017-03-08 15:15:37 -05:00
parent e2abfe256d
commit c9666a1b44
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wrap/Argument.cpp
View File

@ -69,7 +69,7 @@ void Argument::matlab_unwrap(FileWriter& file, const string& matlabName) const {
string cppType = type.qualifiedName("::"); string cppType = type.qualifiedName("::");
string matlabUniqueType = type.qualifiedName(); string matlabUniqueType = type.qualifiedName();
bool isNotScalar = !Argument::isScalar(); bool isNotScalar = !type.isScalar();
// We cannot handle scalar non const references // We cannot handle scalar non const references
if (!isNotScalar && is_ref && !is_const) { if (!isNotScalar && is_ref && !is_const) {