53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From d8f728febf1ca43a3fa06926f2a5290daa3048a8 Mon Sep 17 00:00:00 2001
|
|
From: lwx916518 <lizhenhua12@huawei.com>
|
|
Date: Tue, 19 May 2020 19:26:39 +0800
|
|
Subject: [PATCH] Add function operator= for class ParserCallback
|
|
|
|
---
|
|
ext_libs/muparser/muParserCallback.cpp | 16 ++++++++++++++++
|
|
ext_libs/muparser/muParserCallback.h | 1 +
|
|
2 files changed, 17 insertions(+)
|
|
|
|
diff --git a/ext_libs/muparser/muParserCallback.cpp b/ext_libs/muparser/muParserCallback.cpp
|
|
index 2044fe1..27c5b08 100755
|
|
--- a/ext_libs/muparser/muParserCallback.cpp
|
|
+++ b/ext_libs/muparser/muParserCallback.cpp
|
|
@@ -386,6 +386,22 @@ namespace mu
|
|
m_eOprtAsct = ref.m_eOprtAsct;
|
|
}
|
|
|
|
+ ParserCallback& ParserCallback::operator=(const ParserCallback& cb)
|
|
+ {
|
|
+ if (this != &cb)
|
|
+ {
|
|
+ m_pFun = cb.m_pFun;
|
|
+ m_iArgc = cb.m_iArgc;
|
|
+ m_bAllowOpti = cb.m_bAllowOpti;
|
|
+ m_iCode = cb.m_iCode;
|
|
+ m_iType = cb.m_iType;
|
|
+ m_iPri = cb.m_iPri;
|
|
+ m_eOprtAsct = cb.m_eOprtAsct;
|
|
+ }
|
|
+
|
|
+ return *this;
|
|
+ }
|
|
+
|
|
//---------------------------------------------------------------------------
|
|
/** \brief Clone this instance and return a pointer to the new instance. */
|
|
ParserCallback* ParserCallback::Clone() const
|
|
diff --git a/ext_libs/muparser/muParserCallback.h b/ext_libs/muparser/muParserCallback.h
|
|
index ef32b49..e8e274d 100755
|
|
--- a/ext_libs/muparser/muParserCallback.h
|
|
+++ b/ext_libs/muparser/muParserCallback.h
|
|
@@ -81,6 +81,7 @@ public:
|
|
ParserCallback(strfun_type3 a_pFun, bool a_bAllowOpti);
|
|
ParserCallback();
|
|
ParserCallback(const ParserCallback &a_Fun);
|
|
+ ParserCallback& operator=(const ParserCallback& cb);
|
|
|
|
ParserCallback* Clone() const;
|
|
|
|
--
|
|
2.23.0
|
|
|