From b2fb06557c7f3ccddcc2bd158be87dce5fccee9a Mon Sep 17 00:00:00 2001
From: Kirill Terekhov <kirill.terehov@gmail.com>
Date: Wed, 29 Mar 2017 15:36:21 -0700
Subject: [PATCH] Fix compilation issues

---
 Source/Headers/inmost_dense.h      | 6 +++---
 Source/Headers/inmost_expression.h | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/Headers/inmost_dense.h b/Source/Headers/inmost_dense.h
index beed3b2..8b880ce 100644
--- a/Source/Headers/inmost_dense.h
+++ b/Source/Headers/inmost_dense.h
@@ -1676,8 +1676,8 @@ namespace INMOST
 	{
 		assert(Cols()*Rows()==rows*cols);
 		Matrix<Var> ret(*this);
-		ret.n = rows;
-		ret.m = cols;
+		ret.Rows() = rows;
+		ret.Cols() = cols;
 		return ret;
 	}
 	
@@ -1765,4 +1765,4 @@ INMOST::Matrix<typename INMOST::Promote<INMOST::hessian_variable,typeB>::type> o
 #endif
 
 
-#endif //INMOST_DENSE_INCLUDED
\ No newline at end of file
+#endif //INMOST_DENSE_INCLUDED
diff --git a/Source/Headers/inmost_expression.h b/Source/Headers/inmost_expression.h
index 130c9a0..471df6c 100644
--- a/Source/Headers/inmost_expression.h
+++ b/Source/Headers/inmost_expression.h
@@ -1888,6 +1888,10 @@ template<class A>          __INLINE                          INMOST_DATA_REAL_TY
                            __INLINE                                           void    assign(INMOST::hessian_multivar_expression & Arg, const INMOST::multivar_expression & Val) {Arg = Val; }
                            __INLINE                                           void    assign(INMOST::hessian_multivar_expression & Arg, const INMOST::multivar_expression_reference & Val) {Arg = Val; }
                            __INLINE                                           void    assign(INMOST::hessian_multivar_expression & Arg, const INMOST::hessian_multivar_expression & Val) {Arg = Val; }
+template<class A>          __INLINE                                           void    assign(INMOST_DATA_REAL_TYPE & Arg, const INMOST::shell_expression<A> & Val) {Arg = Val.GetValue();}
+template<class A>          __INLINE                                           void    assign(INMOST::multivar_expression & Arg, const INMOST::shell_expression<A> & Val) {Arg = Val;}
+template<class A>          __INLINE                                           void    assign(INMOST::multivar_expression_reference & Arg, const INMOST::shell_expression<A> & Val) {Arg = Val;}
+template<class A>          __INLINE                                           void    assign(INMOST::hessian_multivar_expression & Arg, const INMOST::shell_expression<A> & Val) {Arg = Val;}
 template<class A>          __INLINE                 INMOST::soft_abs_expression<A> soft_fabs(INMOST::shell_expression<A> const & Arg, INMOST_DATA_REAL_TYPE tol) { return INMOST::soft_abs_expression<A>(Arg,tol); }
                            __INLINE                          INMOST_DATA_REAL_TYPE soft_fabs(INMOST_DATA_REAL_TYPE Arg, INMOST_DATA_REAL_TYPE tol) {return ::sqrt(Arg*Arg+tol*tol);}
 template<class A>          __INLINE                INMOST::soft_sign_expression<A> soft_sign(INMOST::shell_expression<A> const & Arg, INMOST_DATA_REAL_TYPE tol) { return INMOST::soft_sign_expression<A>(Arg,tol); }
-- 
2.26.2