From c9666a1b4407abecdaae707286a707b7cd61aff8 Mon Sep 17 00:00:00 2001
From: Duy-Nguyen Ta <thduynguyen@gmail.com>
Date: Wed, 8 Mar 2017 15:15:37 -0500
Subject: [PATCH] fix merge problem

Argument::isScalar() was moved to Qualified and should be checked via Argument::type
---
 wrap/Argument.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wrap/Argument.cpp b/wrap/Argument.cpp
index 149d6db18..b36094f60 100644
--- a/wrap/Argument.cpp
+++ b/wrap/Argument.cpp
@@ -69,7 +69,7 @@ void Argument::matlab_unwrap(FileWriter& file, const string& matlabName) const {
 
   string cppType = type.qualifiedName("::");
   string matlabUniqueType = type.qualifiedName();
-  bool isNotScalar = !Argument::isScalar();
+  bool isNotScalar = !type.isScalar();
 
   // We cannot handle scalar non const references
   if (!isNotScalar && is_ref && !is_const) {