Merge pull request #322 from Mellanox/master_devel

Merging master_devel to master for 4.14.0-1 release

Author: mataneli94

Makefile.am

@@ -38,7 +38,6 @@ man_MANS = man/mstflint.1 man/mstconfig.1 man/mstmcra.1 man/mstmread.1 man/mstmw
 
 EXTRA_DIST = \
 	mstflint.spec \
-	small_utils/hca_self_test.ofed \
 	common/gitversion.h \
 	debian \
 	$(man_MANS)

adb_parser/adb_expr.cpp

@@ -106,7 +106,7 @@ int AdbExpr::ResolveName(char *name, u_int64_t *val)
 /**
  * Function: AdbExpr::Error
  **/
-void AdbExpr::Error(char *message)
+void AdbExpr::Error(const std::string& message)
 {
     throw AdbException(string("Expression evaluation error: ") + message);
 }

adb_parser/adb_expr.h

@@ -49,7 +49,7 @@ class AdbExpr : public Expr
 
     static const char* statusStr(int status);
     int  ResolveName(char *name, u_int64_t *val);
-    void Error(char *message);
+    void Error(const std::string& message);
     void setVars(map<string, string> *varsMap);
 
 private: