Merge pull request #14515 from Dr15Jones/threadSafetyTinyXML

Changed global bool in TinyXML to be atomic
cms-sw · May 17, 2016 · 7ee9947 · 7ee9947
2 parents 1550b93 + 5f83334
commit 7ee9947
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/FWCore/Utilities/interface/tinyxml.h b/FWCore/Utilities/interface/tinyxml.h
@@ -44,6 +44,7 @@ so fixed them to return a reference to the object.
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <atomic>
 
 // Help out windows:
 #if defined( _DEBUG ) && !defined( DEBUG )
@@ -414,7 +415,7 @@ class TiXmlBase
 
 	};
 	static Entity entity[ NUM_ENTITY ];
-	static bool condenseWhiteSpace;
+	static std::atomic<bool> condenseWhiteSpace;
 };
 
 

diff --git a/FWCore/Utilities/src/tinyxml.cc b/FWCore/Utilities/src/tinyxml.cc
@@ -40,7 +40,7 @@ distribution.
 
 #include <boost/lexical_cast.hpp>
 
-bool TiXmlBase::condenseWhiteSpace = true;
+std::atomic<bool> TiXmlBase::condenseWhiteSpace{true};
 
 // Microsoft compiler security
 FILE* TiXmlFOpen( const char* filename, const char* mode )