Re: [LyX/master] Make static variable non-static

[Richard Heck]

This looks like a good idea for stable, too.

On 05/07/2015 02:24 PM, Georg Baum wrote:

commit b0e387e013b7f247074e82fd466d533cdc6dcd56
Author: Georg Baum <b...@lyx.org>
Date:   Mon Apr 13 21:07:05 2015 +0200

     Make static variable non-static

This is still a hack, but a less dangerous one. The old code had a problem

     if it was called from different threads, or if for some reason it would get
     called recursively.

diff --git a/src/mathed/MacroTable.cpp b/src/mathed/MacroTable.cpp
index 2d29f52..7a75a4f 100644
--- a/src/mathed/MacroTable.cpp
+++ b/src/mathed/MacroTable.cpp
@@ -68,8 +68,7 @@ bool MacroData::expand(vector<MathData> const & args, MathData 
& to) const
        updateData();

// Hack. Any inset with a cell would do.

-       static InsetMathSqrt inset(0);
-       inset.setBuffer(const_cast<Buffer &>(*buffer_));
+       InsetMathSqrt inset(const_cast<Buffer *>(buffer_));

docstring const & definition(display_.empty() ? definition_ : display_);

        asArray(definition, inset.cell(0));