[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-cvs
Subject:    [LyX/master] Whoops. Forgot to add before amending commit.
From:       Richard Heck <rgheck () lyx ! org>
Date:       2014-10-26 17:03:10
Message-ID: 20141026170310.93569280737 () lyx ! lyx ! org
[Download RAW message or body]

commit f454bf931bede3625ca53134c53c62e98f7c6b8e
Author: Richard Heck <rgheck@lyx.org>
Date:   Sun Oct 26 13:02:49 2014 -0400

    Whoops. Forgot to add before amending commit.

diff --git a/src/sgml.cpp b/src/sgml.cpp
index 125ef61..b193593 100644
--- a/src/sgml.cpp
+++ b/src/sgml.cpp
@@ -26,9 +26,9 @@
 #include "support/docstream.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
-#include "support/ThreadStorage.h"
 
 #include <map>
+#include <QThreadStorage>
 
 using namespace std;
 using namespace lyx::support;
@@ -137,10 +137,11 @@ 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();
+	int & mangleID = tMangleID.localData();
 
 	MangledMap::const_iterator const known = mangledNames.find(orig);
 	if (known != mangledNames.end())

[prev in list] [next in list] [prev in thread] [next in thread]