diff options
Diffstat (limited to 'Build/source/libs/graphite-engine/src/segment/GrPassActionCode.cpp')
-rw-r--r-- | Build/source/libs/graphite-engine/src/segment/GrPassActionCode.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Build/source/libs/graphite-engine/src/segment/GrPassActionCode.cpp b/Build/source/libs/graphite-engine/src/segment/GrPassActionCode.cpp index 7c85aabf398..83c58b27e48 100644 --- a/Build/source/libs/graphite-engine/src/segment/GrPassActionCode.cpp +++ b/Build/source/libs/graphite-engine/src/segment/GrPassActionCode.cpp @@ -10,6 +10,8 @@ Last reviewed: Not yet. Description: A continution of the GrPass file, including functions to run the action commands. + +This comment could create a merge conflict. It can be removed. ----------------------------------------------------------------------------------------------*/ //:>******************************************************************************************** @@ -64,8 +66,9 @@ int GrPass::RunCommandCode(GrTableManager * ptman, { byte * pbNext = pbStart; - std::vector<int> vnStack; +// std::vector<int> vnStack; // vnStack.EnsureSpace(128); // make it nice and big + m_vnStack.clear(); gAssert(fConstraints || islot == 0); @@ -85,7 +88,7 @@ int GrPass::RunCommandCode(GrTableManager * ptman, nRet = RunOneCommand(ptman, fConstraints, op, &pbNext, &fMustGet, &fInserting, psstrmIn, psstrmOut, islot, - vnStack, &smf); + m_vnStack, &smf); if (smf == ksmfDone) return nRet; |