diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-14 12:44:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-15 11:47:12 +0200 |
commit | 71b809959bb8f775d83dc52628448bb8b8322b28 (patch) | |
tree | f9aa4308050eb7d55611068602c0cf0e3c1b3690 /sc/source/core | |
parent | 135907f2061550624ee1859745d94eee01849070 (diff) |
remove unnecessary use of void in function declarations
ie.
void f(void);
becomes
void f();
I used the following command to make the changes:
git grep -lP '\(\s*void\s*\)' -- *.cxx \
| xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;'
and ran it for both .cxx and .hxx files.
Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'sc/source/core')
-rw-r--r-- | sc/source/core/opencl/op_addin.hxx | 4 | ||||
-rw-r--r-- | sc/source/core/opencl/op_array.hxx | 6 | ||||
-rw-r--r-- | sc/source/core/opencl/op_database.hxx | 22 | ||||
-rw-r--r-- | sc/source/core/opencl/op_financial.hxx | 162 | ||||
-rw-r--r-- | sc/source/core/opencl/op_logical.hxx | 10 | ||||
-rw-r--r-- | sc/source/core/opencl/op_math.hxx | 168 | ||||
-rw-r--r-- | sc/source/core/opencl/op_spreadsheet.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/opencl/op_statistical.hxx | 142 | ||||
-rw-r--r-- | sc/source/core/opencl/opinlinefun_finacial.cxx | 8 |
9 files changed, 262 insertions, 262 deletions
diff --git a/sc/source/core/opencl/op_addin.hxx b/sc/source/core/opencl/op_addin.hxx index ecdec028392b..c092eebd9daf 100644 --- a/sc/source/core/opencl/op_addin.hxx +++ b/sc/source/core/opencl/op_addin.hxx @@ -19,14 +19,14 @@ class OpBesselj: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Besselj"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Besselj"; } }; class OpGestep: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gestep"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gestep"; } }; }} diff --git a/sc/source/core/opencl/op_array.hxx b/sc/source/core/opencl/op_array.hxx index 410e013a5212..e8d76bef9696 100644 --- a/sc/source/core/opencl/op_array.hxx +++ b/sc/source/core/opencl/op_array.hxx @@ -19,7 +19,7 @@ class OpSumX2MY2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumX2MY2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumX2MY2"; } }; class OpSumX2PY2: public CheckVariables @@ -27,7 +27,7 @@ class OpSumX2PY2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumX2PY2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumX2PY2"; } }; class OpSumXMY2: public CheckVariables @@ -35,7 +35,7 @@ class OpSumXMY2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumXMY2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumXMY2"; } }; }} diff --git a/sc/source/core/opencl/op_database.hxx b/sc/source/core/opencl/op_database.hxx index d64f3bcd37de..30a41618d395 100644 --- a/sc/source/core/opencl/op_database.hxx +++ b/sc/source/core/opencl/op_database.hxx @@ -19,7 +19,7 @@ class OpDmax: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dmax"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dmax"; } }; class OpDmin: public CheckVariables @@ -27,7 +27,7 @@ class OpDmin: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dmin"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dmin"; } }; class OpDproduct: public CheckVariables @@ -35,7 +35,7 @@ class OpDproduct: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dproduct"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dproduct"; } }; class OpDaverage: public CheckVariables @@ -43,7 +43,7 @@ class OpDaverage: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Daverage"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Daverage"; } }; class OpDstdev: public CheckVariables @@ -51,7 +51,7 @@ class OpDstdev: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dstdev"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dstdev"; } }; class OpDstdevp: public CheckVariables @@ -59,7 +59,7 @@ class OpDstdevp: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dstdevp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dstdevp"; } }; class OpDsum: public CheckVariables @@ -67,7 +67,7 @@ class OpDsum: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dsum"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dsum"; } }; class OpDvar: public CheckVariables @@ -75,7 +75,7 @@ class OpDvar: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dvar"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dvar"; } }; class OpDvarp: public CheckVariables @@ -83,7 +83,7 @@ class OpDvarp: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dvarp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dvarp"; } }; class OpDcount: public CheckVariables @@ -91,7 +91,7 @@ class OpDcount: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dcount"; } }; class OpDcount2: public CheckVariables @@ -99,7 +99,7 @@ class OpDcount2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dcount2"; } }; }} diff --git a/sc/source/core/opencl/op_financial.hxx b/sc/source/core/opencl/op_financial.hxx index 0136be7fc4f4..b64d2ee86eee 100644 --- a/sc/source/core/opencl/op_financial.hxx +++ b/sc/source/core/opencl/op_financial.hxx @@ -26,8 +26,8 @@ public: class OpRRI:public RRI { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RRI"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "RRI"; } }; class OpNominal: public Normal @@ -35,131 +35,131 @@ class OpNominal: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NOMINAL_ADD"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NOMINAL_ADD"; } }; class OpDollarde:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dollarde"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dollarde"; } }; class OpDollarfr:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dollarfr"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dollarfr"; } }; class OpDISC: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DISC"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DISC"; } }; class OpINTRATE: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "INTRATE"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "INTRATE"; } }; class OpFV: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FV"; } }; class OpIPMT: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IPMT"; } }; class OpISPMT: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ISPMT"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ISPMT"; } }; class OpDuration: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Duration"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Duration"; } }; class OpDuration_ADD: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Duration_ADD"; } }; class OpMDuration: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE {return "MDuration"; } + virtual std::string BinFuncName() const SAL_OVERRIDE {return "MDuration"; } }; class Fvschedule: public Normal @@ -187,8 +187,8 @@ public: class OpIRR: public IRR { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IRR"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IRR"; } }; class XNPV: public Normal @@ -211,7 +211,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SYD"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SYD"; } }; class MIRR: public Normal @@ -224,26 +224,26 @@ public: class OpEffective:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Effect_Add"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Effect_Add"; } }; class OpCumipmt: public Cumipmt { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cumipmt"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cumipmt"; } }; class OpXNPV: public XNPV { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "XNPV"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "XNPV"; } }; @@ -253,28 +253,28 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbilleq"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "fTbilleq"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpCumprinc: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "cumprinc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "cumprinc"; } }; class OpAccrintm: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Accrintm"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Accrintm"; } }; class OpAccrint: public Normal { @@ -282,7 +282,7 @@ class OpAccrint: public Normal virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Accrint"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Accrint"; } }; class OpYield: public Normal @@ -290,7 +290,7 @@ class OpYield: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yield"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yield"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -299,14 +299,14 @@ class OpSLN: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SLN"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SLN"; } }; class OpFvschedule: public Fvschedule { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fvschedule"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fvschedule"; } }; class OpYieldmat: public Normal @@ -314,7 +314,7 @@ class OpYieldmat: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yieldmat"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yieldmat"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -323,14 +323,14 @@ class OpPMT: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PMT"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PMT"; } }; class OpNPV: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NPV"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NPV"; } }; class OpPrice: public Normal @@ -339,7 +339,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Price"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Price"; } }; class OpNper: public Normal @@ -347,7 +347,7 @@ class OpNper: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NPER"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NPER"; } }; class OpOddlprice: public Normal { @@ -356,7 +356,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>&, std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Oddlprice"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Oddlprice"; } }; class OpOddlyield: public Normal { @@ -365,7 +365,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Oddlyield"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Oddlyield"; } }; class OpPriceDisc: public Normal { @@ -374,7 +374,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>&, std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PriceDisc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PriceDisc"; } }; class OpPPMT: public Normal { @@ -382,39 +382,39 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PPMT"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PPMT"; } }; class OpCoupdaybs:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupdaybs"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdaybs"; } }; class OpCoupdays:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupdays";} + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdays";} }; class OpCoupdaysnc:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupdaysnc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdaysnc"; } }; @@ -424,7 +424,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Couppcd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Couppcd"; } }; @@ -434,18 +434,18 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupncd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupncd"; } }; class OpCoupnum:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupnum"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupnum"; } }; class OpDDB:public Normal @@ -454,7 +454,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DDB"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DDB"; } }; class OpDB:public Normal { @@ -462,34 +462,34 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DB"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DB"; } }; class OpAmordegrc:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Amordegrc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Amordegrc"; } }; class OpAmorlinc:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Amorlinc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Amorlinc"; } }; class OpReceived:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Received"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Received"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -498,7 +498,7 @@ class OpYielddisc: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yielddisc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yielddisc"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -507,15 +507,15 @@ class OpTbillprice: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbillprice"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "fTbillprice"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpPriceMat:public PriceMat { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PriceMat"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PriceMat"; } }; class RATE: public Normal @@ -527,8 +527,8 @@ public: }; class OpIntrate: public RATE { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "rate"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "rate"; } }; class OpTbillyield: public Normal @@ -537,15 +537,15 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbillyield"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "fTbillyield"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpMIRR: public MIRR { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MIRR"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "MIRR"; } }; class OpPV: public Normal @@ -553,7 +553,7 @@ class OpPV: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PV"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PV"; } }; class OpVDB: public CheckVariables @@ -562,7 +562,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VDB"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "VDB"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -572,7 +572,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Xirr"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Xirr"; } }; }} diff --git a/sc/source/core/opencl/op_logical.hxx b/sc/source/core/opencl/op_logical.hxx index be0ba3755fb2..db29889cc815 100644 --- a/sc/source/core/opencl/op_logical.hxx +++ b/sc/source/core/opencl/op_logical.hxx @@ -19,7 +19,7 @@ class OpAnd: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "And"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "And"; } }; class OpOr: public Normal @@ -27,28 +27,28 @@ class OpOr: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Or"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Or"; } }; class OpNot: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Not"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Not"; } }; class OpXor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Xor"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Xor"; } }; class OpIf:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IF"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IF"; } }; }} diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx index 3929154c698b..6cb1eab34a79 100644 --- a/sc/source/core/opencl/op_math.hxx +++ b/sc/source/core/opencl/op_math.hxx @@ -20,7 +20,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cos"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cos"; } }; class OpSec: public Normal { @@ -28,7 +28,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sec"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sec"; } }; class OpSecH: public Normal { @@ -36,7 +36,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SecH"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SecH"; } }; class OpMROUND: public Normal { @@ -44,7 +44,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MROUND"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "MROUND"; } }; class OpCsc: public Normal @@ -52,16 +52,16 @@ class OpCsc: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Csc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Csc"; } }; class OpSumIfs: public CheckVariables { public: - OpSumIfs(void): CheckVariables(), mNeedReductionKernel(false) {} + OpSumIfs(): CheckVariables(), mNeedReductionKernel(false) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIfs"; } - bool NeedReductionKernel(void) const { return mNeedReductionKernel; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumIfs"; } + bool NeedReductionKernel() const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; }; @@ -71,43 +71,43 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cosh"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cosh"; } }; class OpSinh: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sinh"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sinh"; } }; class OpSin: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sin"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sin"; } }; class OpAbs:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScAbs"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScAbs"; } }; class OpArcCos:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACos"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACos"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpArcCosHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "1.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACosH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "1.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACosH"; } }; class OpTan: public Normal { @@ -115,7 +115,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Tan"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Tan"; } }; class OpTanH: public Normal { @@ -123,7 +123,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TanH"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TanH"; } }; class OpSqrt: public Normal { @@ -131,36 +131,36 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sqrt"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sqrt"; } }; class OpArcCot:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACot"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACot"; } }; class OpArcCotHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "2.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACotH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "2.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACotH"; } }; class OpArcSin:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScASin"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScASin"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpArcSinHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScASinH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScASinH"; } }; class OpTrunc: public Normal { @@ -168,120 +168,120 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Trunc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Trunc"; } }; class OpArcTan2:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATan2"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATan2"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpArcTan:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATan"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATan"; } }; class OpArcTanH:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATanH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATanH"; } }; class OpBitAnd:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitAnd"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitAnd"; } }; class OpBitOr:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitOr"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitOr"; } }; class OpBitXor:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitXor"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitXor"; } }; class OpBitLshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitLshift"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitLshift"; } }; class OpBitRshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitRshift"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitRshift"; } }; class OpLn: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Ln"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Ln"; } }; class OpRound: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Round"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Round"; } }; class OpRoundUp: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundUp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "RoundUp"; } }; class OpRoundDown: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundDown"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "RoundDown"; } }; class OpInt: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Int"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Int"; } }; class OpRadians: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Radians"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Radians"; } }; class OpIsEven: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsEven"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IsEven"; } }; class OpIsOdd: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsOdd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IsOdd"; } }; class OpCot: public Normal { @@ -289,7 +289,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cot"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cot"; } }; class OpSumSQ: public Normal { @@ -297,7 +297,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumSQ"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumSQ"; } }; class OpCoth: public Normal { @@ -306,63 +306,63 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coth"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coth"; } }; class OpPower: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Power"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Power"; } }; class OpOdd: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Odd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Odd"; } }; class OpFloor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Floor"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Floor"; } }; class OpCscH: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CscH"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "CscH"; } }; class OpCeil:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScCeil"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScCeil"; } }; class OpExp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Exp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Exp"; } }; class OpLog10: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log10"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Log10"; } }; class OpConvert: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Convert"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Convert"; } virtual bool takeString() const SAL_OVERRIDE { return true; } }; @@ -372,21 +372,21 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Even"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Even"; } }; class OpAverageIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIfs"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "AverageIfs"; } }; class OpCountIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CountIfs"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "CountIfs"; } }; class OpMod: public Normal { @@ -394,14 +394,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Mod"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Mod"; } }; class OpProduct: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Product"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Product"; } }; class OpSqrtPi: public Normal { @@ -409,7 +409,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SqrtPi"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SqrtPi"; } }; class OpCombinA: public Normal @@ -418,7 +418,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Combina"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Combina"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpLog: public Normal @@ -427,14 +427,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Log"; } }; class OpCombin: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScCombin"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScCombin"; } }; class OpAverageIf: public CheckVariables { @@ -442,56 +442,56 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIf"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "AverageIf"; } }; class OpDeg: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Degrees"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Degrees"; } }; class OpCountIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Countif"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Countif"; } }; class OpFact: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fact"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fact"; } }; class OpSeriesSum: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SeriesSum"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SeriesSum"; } }; class OpSumIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIf"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumIf"; } }; class OpQuotient: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Quotient"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Quotient"; } }; class OpNegSub: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NegSub"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NegSub"; } }; }} diff --git a/sc/source/core/opencl/op_spreadsheet.hxx b/sc/source/core/opencl/op_spreadsheet.hxx index 01795062b616..e787bda0a4cd 100644 --- a/sc/source/core/opencl/op_spreadsheet.hxx +++ b/sc/source/core/opencl/op_spreadsheet.hxx @@ -19,7 +19,7 @@ class OpVLookup: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VLookup"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "VLookup"; } virtual bool takeString() const SAL_OVERRIDE { return true; } }; diff --git a/sc/source/core/opencl/op_statistical.hxx b/sc/source/core/opencl/op_statistical.hxx index 792c486ea6be..0f9eb6478392 100644 --- a/sc/source/core/opencl/op_statistical.hxx +++ b/sc/source/core/opencl/op_statistical.hxx @@ -19,35 +19,35 @@ class OpStandard: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Standard"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Standard"; } }; class OpExponDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ExponDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ExponDist"; } }; class OpVar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Var"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Var"; } }; class OpSTEYX: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "STEYX"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "STEYX"; } }; class OpVarP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VarP"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "VarP"; } }; class OpZTest: public Normal { @@ -55,14 +55,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ZTest"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ZTest"; } }; class OpStDevP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "StDevP"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "StDevP"; } }; class OpStDev: public Normal @@ -70,28 +70,28 @@ class OpStDev: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "StDev"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "StDev"; } }; class OpSkewp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Skewp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Skewp"; } }; class OpSlope: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Slope"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Slope"; } }; class OpWeibull: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Weibull"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Weibull"; } }; class OpFdist: public Normal { @@ -99,14 +99,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fdist"; } }; class OpTDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TDist"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpTInv: public Normal @@ -114,7 +114,7 @@ class OpTInv: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TInv"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpTTest: public Normal @@ -122,7 +122,7 @@ class OpTTest: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TTest"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TTest"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpSkew: public Normal @@ -130,14 +130,14 @@ class OpSkew: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Skew"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Skew"; } }; class OpFisher: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fisher"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fisher"; } }; class OpFisherInv: public Normal @@ -145,7 +145,7 @@ class OpFisherInv: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FisherInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FisherInv"; } }; class OpGamma: public Normal @@ -153,7 +153,7 @@ class OpGamma: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gamma"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gamma"; } }; class OpCorrel: public Normal @@ -161,7 +161,7 @@ class OpCorrel: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Correl"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Correl"; } }; class OpNegbinomdist: public Normal @@ -169,7 +169,7 @@ class OpNegbinomdist: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNegbinomdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNegbinomdist"; } }; class OpPearson: public Normal @@ -177,7 +177,7 @@ class OpPearson: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPearson"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPearson"; } }; class OpGammaLn: public Normal @@ -185,7 +185,7 @@ class OpGammaLn: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaLn"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaLn"; } }; class OpGauss: public Normal @@ -195,17 +195,17 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gauss"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gauss"; } }; class OpGeoMean: public CheckVariables { public: - OpGeoMean(void): CheckVariables(), mNeedReductionKernel(true) {} + OpGeoMean(): CheckVariables(), mNeedReductionKernel(true) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GeoMean"; } - bool NeedReductionKernel(void) const { return mNeedReductionKernel; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GeoMean"; } + bool NeedReductionKernel() const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; }; @@ -215,7 +215,7 @@ class OpHarMean: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "HarMean"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "HarMean"; } }; class OpRsq: public Normal @@ -223,124 +223,124 @@ class OpRsq: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpRsq"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpRsq"; } }; class OpNormdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormdist"; } }; class OpMedian:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMedian"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMedian"; } }; class OpNormsdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormsdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormsdist"; } }; class OpNorminv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNorminv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNorminv"; } }; class OpNormsinv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormsinv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormsinv"; } }; class OpPhi:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPhi"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPhi"; } }; class OpKurt: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Kurt"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Kurt"; } }; class OpCovar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Covar"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Covar"; } }; class OpPermut:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPermut"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPermut"; } }; class OpPermutationA:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPermutationA";} + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPermutationA";} }; class OpConfidence: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Confidence"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Confidence"; } }; class OpIntercept: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Intercept"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Intercept"; } }; class OpLogInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "LogInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "LogInv"; } }; class OpCritBinom: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CritBinom"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "CritBinom"; } }; class OpForecast: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Forecast"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Forecast"; } }; class OpLogNormDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "LogNormdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "LogNormdist"; } }; class OpGammaDist: public Normal { @@ -348,34 +348,34 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaDist"; } }; class OpHypGeomDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpHypGeomDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpHypGeomDist"; } }; class OpChiDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpChiDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpChiDist"; } }; class OpBinomdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpBinomdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpBinomdist"; } }; class OpChiSqDist: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ChiSqDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ChiSqDist"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -384,7 +384,7 @@ class OpChiSqInv: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ChiSqInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ChiSqInv"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpChiInv:public Normal{ @@ -392,14 +392,14 @@ class OpChiInv:public Normal{ virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpChiInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpChiInv"; } }; class OpPoisson:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPoisson"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPoisson"; } }; class OpGammaInv: public Normal @@ -409,7 +409,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaInv"; } }; class OpFInv: public Normal { @@ -418,7 +418,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FInv"; } }; class OpFTest: public Normal { @@ -427,14 +427,14 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FTest"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FTest"; } }; class OpDevSq: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DevSq"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DevSq"; } }; class OpB: public Normal { @@ -443,7 +443,7 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "B"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "B"; } }; class OpBetaDist: public Normal { @@ -452,21 +452,21 @@ public: const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "BetaDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "BetaDist"; } }; class OpBetainv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpBetainv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpBetainv"; } }; class OpMinA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMinA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMinA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -475,7 +475,7 @@ class OpCountA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpCountA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpCountA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -484,7 +484,7 @@ class OpMaxA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMaxA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMaxA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -493,7 +493,7 @@ class OpVarA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVarA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpVarA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -502,7 +502,7 @@ class OpVarPA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVarPA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpVarPA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -511,7 +511,7 @@ class OpStDevPA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpStDevPA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpStDevPA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -520,7 +520,7 @@ class OpAverageA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpAverageA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpAverageA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -529,7 +529,7 @@ class OpStDevA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpStDevA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpStDevA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -538,7 +538,7 @@ class OpAveDev: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AveDev"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "AveDev"; } }; }} diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index c18212fdeb58..f062954d4115 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -272,18 +272,18 @@ std::string DateToDays_new= "}\n"; std::string GetNullDateDecl= -"int GetNullDate(void);\n"; +"int GetNullDate();\n"; std::string GetNullDate= -"int GetNullDate(void)\n" +"int GetNullDate()\n" "{\n" " return DateToDays(30,12,1899 );\n" "}\n"; std::string GetNullDate_newDecl= -"int GetNullDate_new(void);\n"; +"int GetNullDate_new();\n"; std::string GetNullDate_new= -"int GetNullDate_new(void)\n" +"int GetNullDate_new()\n" "{\n" " return DateToDays_new(30,12,1899 );\n" "}\n"; |