Rename the minted 'lang' external template option as 'language'

[lyx.git] / src / sgml.cpp

diff --git a/src/sgml.cpp b/src/sgml.cpp
index 125ef611fa89e345b18e00f23d8fec4cb8de0e3c..2facb3ed539e280d459fed50a9f9fba1ba7f3b48 100644 (file)
--- a/src/sgml.cpp
+++ b/src/sgml.cpp
@@ -26,9 +26,10 @@
 #include "support/docstream.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/ThreadStorage.h"
 
+#include <atomic>
 #include <map>
+#include <QThreadStorage>
 
 using namespace std;
 using namespace lyx::support;
@@ -105,10 +106,8 @@ docstring sgml::escapeString(docstring const & raw)
 
 docstring const sgml::uniqueID(docstring const & label)
 {
-       // FIXME THREAD
-       // It seems unlikely there could be a problem here,
-       // but we could have concurrent access, in principle.
-       static unsigned int seed = 1000;
+       // thread-safe
+       static atomic_uint seed(1000);
        return label + convert<docstring>(++seed);
 }
 
@@ -137,10 +136,10 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
        docstring content;
 
        typedef map<docstring, docstring> MangledMap;
-       static ThreadStorage<MangledMap> tMangledNames;
-       MangledMap & mangledNames = *tMangledNames;
-       static ThreadStorage<int> tMangleID;
-       int & mangleID = *tMangleID;
+       static QThreadStorage<MangledMap> tMangledNames;
+       static QThreadStorage<int> tMangleID;
+
+       MangledMap & mangledNames = tMangledNames.localData();
 
        MangledMap::const_iterator const known = mangledNames.find(orig);
        if (known != mangledNames.end())
@@ -169,9 +168,10 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
                }
        }
 
-       if (mangle)
+       if (mangle) {
+               int & mangleID = tMangleID.localData();
                content += "-" + convert<docstring>(mangleID++);
-       else if (isDigitASCII(content[content.size() - 1]))
+       } else if (isDigitASCII(content[content.size() - 1]))
                content += ".";
 
        mangledNames[orig] = content;