From eb93046b82d07522ad30bc08dd4017e93f157ee4 Mon Sep 17 00:00:00 2001
From: Lynn Garren <garren@fnal.gov>
Date: Fri, 18 Nov 2016 14:31:47 -0600
Subject: [PATCH] we now generate thread_local.h

---
 ChangeLog                      |  7 +++++++
 Utility/ChangeLog              |  6 ++++++
 Utility/Utility/thread_local.h | 31 -------------------------------
 3 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 Utility/Utility/thread_local.h

diff --git a/ChangeLog b/ChangeLog
index 1920d319..c4e8270b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
 
+2016-11-18 Lynn Garren <garren@fnal.gov> 
+
+  * cmake: Add the ability to build single threaded if desired.
+    Multihreading remains enabled by default.
+    Use cmake -DCLHEP_SINGLE_THREAD=ON to disable multithreading.
+  * Utility/thread_local.h will be generated appropriately
+
 2016-11-11 Gabriele Cosmo <Gabriele.Cosmo@cern.ch>
 
   * Random/Random/mixmax.h: corrected value of SPECIALMUL in mixmax.h to correspond to
diff --git a/Utility/ChangeLog b/Utility/ChangeLog
index 0a10355f..a8d75f0d 100755
--- a/Utility/ChangeLog
+++ b/Utility/ChangeLog
@@ -1,3 +1,9 @@
+
+2016-11-18 Lynn Garren <garren@fnal.gov> 
+
+  * Utility/thread_local.h will be generated as part 
+    of enabling either a single or multi threaded build
+
 ==============================
 26.08.16 Release CLHEP-2.3.3.2
 ==============================
diff --git a/Utility/Utility/thread_local.h b/Utility/Utility/thread_local.h
deleted file mode 100644
index 87520e6d..00000000
--- a/Utility/Utility/thread_local.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef CLHEP_THREAD_LOCAL_H
-#define CLHEP_THREAD_LOCAL_H
-
-// ======================================================================
-//
-// Use thread_local when the compiler declares it uses the C++11 standard
-//
-// ======================================================================
-#ifdef CLHEP_SINGLE_THREAD
-  #define CLHEP_THREAD_LOCAL
-#else
-  #if __cplusplus >= 201103L
-
-    #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
-      #define CLHEP_THREAD_LOCAL thread_local
-    #elif __clang__
-      #if __has_feature(cxx_thread_local)
-	#define CLHEP_THREAD_LOCAL thread_local
-      #else
-	#define CLHEP_THREAD_LOCAL
-      #endif
-    #else
-      #define CLHEP_THREAD_LOCAL
-    #endif
-
-  #else
-    #define CLHEP_THREAD_LOCAL
-  #endif
-#endif
-
-#endif // CLHEP_THREAD_LOCAL_H
-- 
GitLab