[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - include/formula

[Kohei Yoshida]

 include/formula/token.hxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 13683a0719c52b451b6e906a115f4bb0e40bd7ae
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Nov 6 20:56:20 2013 -0500

    Correct reference count type.
    
    Change-Id: Id7902c8d21d22a6d5f3740a6bd72e0c1213461e7

diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index ea91e2c..f5b49cc 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -93,13 +93,13 @@ class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
 protected:
 
             const StackVar      eType;          // type of data
-            mutable sal_uInt16  nRefCnt;        // reference count
+            mutable oslInterlockedCount mnRefCnt;        // reference count
 
 public:
                                 FormulaToken( StackVar eTypeP,OpCode e = ocPush ) :
-                                    eOp(e), eType( eTypeP ), nRefCnt(0) {}
+                                    eOp(e), eType( eTypeP ), mnRefCnt(0) {}
                                 FormulaToken( const FormulaToken& r ) : IFormulaToken(),
-                                    eOp(r.eOp), eType( r.eType ), nRefCnt(0) {}
+                                    eOp(r.eOp), eType( r.eType ), mnRefCnt(0) {}
 
     virtual                     ~FormulaToken();
 
@@ -111,16 +111,16 @@ public:
 
     inline void IncRef() const
     {
-        osl_atomic_increment(&nRefCnt);
+        osl_atomic_increment(&mnRefCnt);
     }
 
     inline void DecRef() const
     {
-        if (!osl_atomic_decrement(&nRefCnt))
+        if (!osl_atomic_decrement(&mnRefCnt))
             const_cast<FormulaToken*>(this)->Delete();
     }
 
-    inline  sal_uInt16          GetRef() const          { return nRefCnt; }
+    inline oslInterlockedCount GetRef() const { return mnRefCnt; }
     inline OpCode               GetOpCode() const       { return eOp; }
 
     /**