sc/inc/compiler.hxx | 15 +++++---------- sc/source/core/tool/token.cxx | 5 +---- 2 files changed, 6 insertions(+), 14 deletions(-)
New commits: commit dcc56d663059b3baced58e34bb8186a05ceadf53 Author: Eike Rathke <[email protected]> Date: Thu Sep 1 14:16:03 2016 +0200 remove now pointless comment about alignment boundaries ... and adapt ScRawToken size comment to reality. Change-Id: Ia9c1cecc5d01f49c6d5fbe5b53472e6f0ef153cb diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 1e68576..ba91d2a 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -204,10 +204,7 @@ namespace } // namespace -// Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2) - -// Since RawTokens are temporary for the compiler, don't align on 4k and waste memory. -// ScRawToken size is FixMembers + MAXSTRLEN + ~4 ~= 1036 +// ScRawToken size is OpCode + StackVar + MAXSTRLEN+1 + ~20 ~= 1049 IMPL_FIXEDMEMPOOL_NEWDEL( ScRawToken ) // Need a whole bunch of ScSingleRefToken commit f684d1edfd48b686549b893dc0612c31d9617bdc Author: Eike Rathke <[email protected]> Date: Thu Sep 1 13:48:51 2016 +0200 cosmetics Change-Id: I22d4c04db2917f96e3c9ca1a71c628e859ad13c5 diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index ba32974..14e760e 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -91,7 +91,6 @@ class CompileFormulaContext; // constants and data types internal to compiler - struct ScRawToken { friend class ScCompiler; @@ -99,19 +98,19 @@ struct ScRawToken // the private dtor) and know what they're doing.. friend class ScTokenArray; protected: - OpCode eOp; - formula::StackVar eType; // type of data; this determines how the unions are used + OpCode eOp; + formula::StackVar eType; // type of data; this determines how the unions are used public: union { double nValue; struct { - sal_uInt8 cByte; + sal_uInt8 cByte; bool bIsInForceArray; } sbyte; ScComplexRefData aRef; struct { - sal_uInt16 nFileId; - sal_Unicode cTabName[MAXSTRLEN+1]; + sal_uInt16 nFileId; + sal_Unicode cTabName[MAXSTRLEN+1]; ScComplexRefData aRef; } extref; struct { commit ce23f28157e8925be815d7e7340e229e4302ce15 Author: Eike Rathke <[email protected]> Date: Thu Sep 1 13:32:12 2016 +0200 move comment to where it belongs Change-Id: Ia3110b911e6d367a3b5d246a95384efc2f72f9f8 diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 849e8ca..ba32974 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -91,10 +91,6 @@ class CompileFormulaContext; // constants and data types internal to compiler -/* - OpCode eOp; // OpCode - formula::StackVar eType; // type of data - */ struct ScRawToken { @@ -104,7 +100,7 @@ struct ScRawToken friend class ScTokenArray; protected: OpCode eOp; - formula::StackVar eType; + formula::StackVar eType; // type of data; this determines how the unions are used public: union { double nValue; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
