port the CMS additions

Author: fabiocos

JetCleanser/JetCleanser.cc

@@ -30,7 +30,10 @@ FASTJET_BEGIN_NAMESPACE      // defined in fastjet/internal/base.hh
 namespace contrib{
 
   // Modification to satisfy C++11 (thanks to Gavin Salam)
+#if __cplusplus >= 201103L
+#else
   const double JetCleanser::jc_zero = 1.0e-6;
+#endif 
 
   /////////////////////////////
   // constructor

JetCleanser/JetCleanser.hh

@@ -105,7 +105,13 @@ public:
 private:
   // Modification to satisfy C++11 (thanks to Gavin Salam)
   //static const double jc_zero = 1.0e-6;
+//CMS change:
+// Change not endorsed by fastjet collaboration
+#if __cplusplus >= 201103L
+  static constexpr double jc_zero = 1.0e-6;
+#else
   static const double jc_zero;
+#endif 
 
   double _rsub;
   double _fcut;

RecursiveTools/RecursiveSymmetryCutBase.cc

@@ -37,7 +37,7 @@ LimitedWarning RecursiveSymmetryCutBase::_mu2_gt1_warning;
 //LimitedWarning RecursiveSymmetryCutBase::_nonca_warning;
 LimitedWarning RecursiveSymmetryCutBase::_explicit_ghost_warning;
 
-bool RecursiveSymmetryCutBase::_verbose = false;
+std::atomic<bool> RecursiveSymmetryCutBase::_verbose {false};
 
 //----------------------------------------------------------------------
 PseudoJet RecursiveSymmetryCutBase::result(const PseudoJet & jet) const {

RecursiveTools/include/fastjet/contrib/RecursiveSymmetryCutBase.hh

@@ -37,6 +37,8 @@
 #else
 #include "Recluster.hh"
 #endif
+#include <atomic>
+
 
 /** \mainpage RecursiveTools contrib 
 
@@ -215,7 +217,7 @@ public:
   class StructureType;
 
   /// for testing 
-  static bool _verbose;
+  static std::atomic<bool> _verbose;
 
 protected:
   // the methods below have to be defined by deerived classes