[Libreoffice-commits] core.git: Branch 'private/kohei/opencl-kernel-crash' - formula/source include/formula
Kohei Yoshida
kohei.yoshida at collabora.com
Thu Mar 6 12:03:30 PST 2014
formula/source/core/api/token.cxx | 11 +++++++++++
include/formula/token.hxx | 6 ++----
2 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit a37c8cdde981551b8c679fa59a7055c072ce164e
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Thu Mar 6 15:01:39 2014 -0500
Make these non inline.
Change-Id: Ib139850380b039382565e3de3666eebb5750f32d
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 9ea95f9..4f8b8aa 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -60,6 +60,17 @@ inline bool lcl_IsReference( OpCode eOp, StackVar eType )
}
// --- class FormulaToken --------------------------------------------------------
+
+FormulaToken::FormulaToken( StackVar eTypeP, OpCode e ) :
+ eOp(e), eType( eTypeP ), mnRefCnt(0)
+{
+}
+
+FormulaToken::FormulaToken( const FormulaToken& r ) :
+ IFormulaToken(), eOp(r.eOp), eType( r.eType ), mnRefCnt(0)
+{
+}
+
FormulaToken::~FormulaToken()
{
}
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index baf050a..f65220b 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -94,10 +94,8 @@ protected:
mutable oslInterlockedCount mnRefCnt; // reference count
public:
- FormulaToken( StackVar eTypeP,OpCode e = ocPush ) :
- eOp(e), eType( eTypeP ), mnRefCnt(0) {}
- FormulaToken( const FormulaToken& r ) : IFormulaToken(),
- eOp(r.eOp), eType( r.eType ), mnRefCnt(0) {}
+ FormulaToken( StackVar eTypeP,OpCode e = ocPush );
+ FormulaToken( const FormulaToken& r );
virtual ~FormulaToken();
More information about the Libreoffice-commits
mailing list