Enable C++ modules for CLHEP

The C++ modules feature as described in https://clang.llvm.org/docs/Modules.html allow producing a binary header representation to avoid redundant header reparsing. This feature is used in ROOT's dictionary system since ROOT v6.20: https://github.com/root-project/root/blob/master/README/README.CXXMODULES.md CMSSW and other experiment migrate their dictionaries to use the provided by ROOT C++ modules support: cms-sw/cmssw#15248 Dictionaries which transiently include clhep can be further optimized by building a separate module for CLHEP which this MR aims for. The current patch introduces a module.modulemap file containing a mapping between a binary artifact (a module or a pcm file) and a set of header files. The C++ modules are more picky on translation unit encapsulation and thus require all headers which a translation unit uses to be included. In addition to the missing include we outline a few virtual destructors to avoid pollution of .o files with weak virtual tables. This patch enables builds with modules via rootcling/genreflex/rootcint and enables compile-time module builds if configured like: cmake -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="-fmodules -Xclang -fmodules-local-submodule-visibility" ../clhep/ The module.modulemap file is easy to maintain as it globs for the well-behaved header files and enumerates already the ones needed special treatment. Once merged we will backport this to cmssw. Conflicts: Matrix/src/DiagMatrix.cc Matrix/src/GenMatrix.cc Matrix/src/Matrix.cc Matrix/src/SymMatrix.cc Matrix/src/Vector.cc
drbenmorgan · Nov 9, 2020 · caa0aa3 · caa0aa3
1 parent 0700273
commit caa0aa3
Show file tree

Hide file tree

Showing 126 changed files with 443 additions and 35 deletions.
diff --git a/Exceptions/Exceptions/ZMexHandler.h b/Exceptions/Exceptions/ZMexHandler.h
@@ -103,7 +103,7 @@ class ZMexHandler  :  public ZMhandleTo< ZMexHandlerBehavior >  {
     ZMhandleTo<ZMexHandlerBehavior>( behaviorWanted )
   { }
 
-  virtual ~ZMexHandler() { }
+  virtual ~ZMexHandler();
 
   std::string name() const {
     return  rep_->name();

diff --git a/Exceptions/src/ZMerrno.cc b/Exceptions/src/ZMerrno.cc
@@ -26,6 +26,7 @@
 
 #include "CLHEP/Exceptions/ZMexception.h"
 
+#include <string>
 
 namespace zmex  {
 

diff --git a/Exceptions/src/ZMexClassInfo.cc b/Exceptions/src/ZMexClassInfo.cc
@@ -16,6 +16,9 @@
 
 #include "CLHEP/Exceptions/ZMexClassInfo.h"
 
+#include "CLHEP/Exceptions/ZMexSeverity.h"
+
+#include <string>
 
 namespace zmex  {
 

diff --git a/Exceptions/src/ZMexHandler.cc b/Exceptions/src/ZMexHandler.cc
@@ -17,11 +17,17 @@
 
 #include "CLHEP/Exceptions/ZMexHandler.h"
 
+#include "CLHEP/Exceptions/ZMexAction.h"
 #include "CLHEP/Exceptions/ZMexception.h"
+#include "CLHEP/Exceptions/ZMexLogResult.h"
+#include "CLHEP/Exceptions/ZMexSeverity.h"
+
+#include <string>
 
 
 namespace zmex  {
 
+ZMexHandler::~ZMexHandler() { }
 
 //******************************************
 //

diff --git a/Exceptions/src/ZMexLogger.cc b/Exceptions/src/ZMexLogger.cc
@@ -22,7 +22,10 @@
 
 #include "CLHEP/Exceptions/ZMexLogger.h"
 #include "CLHEP/Exceptions/ZMexception.h"
+#include "CLHEP/RefCount/ZMhandleTo.h"
 
+#include <iostream>
+#include <string>
 
 // ----------------------------------------------------------------------
 

diff --git a/Exceptions/src/ZMexSeverity.cc b/Exceptions/src/ZMexSeverity.cc
@@ -12,6 +12,10 @@
 
 #include "CLHEP/Exceptions/ZMexSeverity.h"
 
+#include "CLHEP/Exceptions/ZMerrno.h"
+
+#include <string>
+
 
 namespace zmex  {
 

diff --git a/Exceptions/src/ZMexception.cc b/Exceptions/src/ZMexception.cc
@@ -34,9 +34,11 @@
 #include "CLHEP/Exceptions/defs.h"
 #include "CLHEP/Exceptions/ZMexception.h"
 #include "CLHEP/Exceptions/ZMexAction.h"
+#include "CLHEP/Exceptions/ZMexClassInfo.h"
 #include "CLHEP/Exceptions/ZMexHandler.h"
 #include "CLHEP/Exceptions/ZMexLogger.h"
 #include "CLHEP/Exceptions/ZMexLogResult.h"
+#include "CLHEP/Exceptions/ZMexSeverity.h"
 
 #include <sstream>
 #include <ctime>

diff --git a/Exceptions/src/ZMthrow.cc b/Exceptions/src/ZMthrow.cc
@@ -15,10 +15,12 @@
 
 
 #include "CLHEP/Exceptions/ZMthrow.h"
-#include "CLHEP/Exceptions/ZMexSeverity.h"
-#include "CLHEP/Exceptions/ZMexception.h"
 #include "CLHEP/Exceptions/ZMerrno.h"
+#include "CLHEP/Exceptions/ZMexAction.h"
+#include "CLHEP/Exceptions/ZMexception.h"
+#include "CLHEP/Exceptions/ZMexSeverity.h"
 
+#include <string>
 
 namespace zmex  {
 

diff --git a/Exceptions/test/exctest1.cc b/Exceptions/test/exctest1.cc
@@ -4,6 +4,9 @@ using std::endl;
 
 
 #include "CLHEP/Exceptions/ZMexception.h"
+#include "CLHEP/Exceptions/ZMexAction.h"
+#include "CLHEP/Exceptions/ZMexClassInfo.h"
+#include "CLHEP/Exceptions/ZMexSeverity.h"
 #include "CLHEP/Exceptions/ZMthrow.h"
 using namespace zmex;
 

diff --git a/Exceptions/test/exctest4.cc b/Exceptions/test/exctest4.cc
@@ -4,6 +4,9 @@ using std::endl;
 
 
 #include "CLHEP/Exceptions/ZMexception.h"
+#include "CLHEP/Exceptions/ZMexAction.h"
+#include "CLHEP/Exceptions/ZMexClassInfo.h"
+#include "CLHEP/Exceptions/ZMexSeverity.h"
 #include "CLHEP/Exceptions/ZMthrow.h"
 using namespace zmex;
 

diff --git a/Exceptions/test/exctestNothrow.cc b/Exceptions/test/exctestNothrow.cc
@@ -8,10 +8,16 @@
 
 #include "CLHEP/Exceptions/ZMthrow.h"
 #include "CLHEP/Exceptions/ZMexception.h"
+#include "CLHEP/Exceptions/ZMexAction.h"
+#include "CLHEP/Exceptions/ZMexClassInfo.h"
+#include "CLHEP/Exceptions/ZMexSeverity.h"
 #include "CLHEP/Exceptions/ZMerrno.h"
+
 using namespace zmex;
 
+#include <iostream>
 #include <fstream>
+
 using namespace std;
 
 

diff --git a/Exceptions/test/testExceptions.cc b/Exceptions/test/testExceptions.cc
@@ -20,8 +20,13 @@
 #include "CLHEP/Exceptions/defs.h"
 #include "CLHEP/Cast/itos.h"
 #include "CLHEP/Exceptions/ZMthrow.h"
-#include "CLHEP/Exceptions/ZMexception.h"
+#include "CLHEP/Exceptions/ZMexAction.h"
+#include "CLHEP/Exceptions/ZMexClassInfo.h"
+#include "CLHEP/Exceptions/ZMexSeverity.h"
 #include "CLHEP/Exceptions/ZMerrno.h"
+#include "CLHEP/Exceptions/ZMexception.h"
+
+#include <iostream>
 
 
 using namespace zmex;

diff --git a/Exceptions/test/testThrowFrom.cc b/Exceptions/test/testThrowFrom.cc
@@ -14,7 +14,11 @@
 
 #include "CLHEP/Exceptions/ZMthrow.h"
 #include "CLHEP/Exceptions/ZMexception.h"
+#include "CLHEP/Exceptions/ZMexAction.h"
+#include "CLHEP/Exceptions/ZMexClassInfo.h"
+#include "CLHEP/Exceptions/ZMexSeverity.h"
 
+#include <iostream>
 using namespace zmex;
 
 ZMexStandardDefinition( ZMexception, ZMxTest );

diff --git a/Exceptions/test/testzmex.cc b/Exceptions/test/testzmex.cc
@@ -20,6 +20,9 @@
 
 #include "CLHEP/Exceptions/ZMthrow.h"
 #include "CLHEP/Exceptions/ZMexception.h"
+#include "CLHEP/Exceptions/ZMexAction.h"
+#include "CLHEP/Exceptions/ZMexClassInfo.h"
+#include "CLHEP/Exceptions/ZMexSeverity.h"
 #include "CLHEP/Exceptions/ZMerrno.h"
 
 

diff --git a/GenericFunctions/GenericFunctions/ButcherTableau.icc b/GenericFunctions/GenericFunctions/ButcherTableau.icc
@@ -1,3 +1,4 @@
+#include <ostream> // for std::endl
 namespace Genfun {
   ButcherTableau::ButcherTableau(const std::string &xname, unsigned int xorder):_name(xname),_order(xorder){
   }

diff --git a/GenericFunctions/GenericFunctions/ExtendedButcherTableau.icc b/GenericFunctions/GenericFunctions/ExtendedButcherTableau.icc
@@ -1,3 +1,4 @@
+#include <ostream> // for std::endl
 namespace Genfun {
   ExtendedButcherTableau::ExtendedButcherTableau(const std::string &mname, 
 						 unsigned int xorder,

diff --git a/GenericFunctions/GenericFunctions/FunctionTimesParameter.hh b/GenericFunctions/GenericFunctions/FunctionTimesParameter.hh
@@ -12,6 +12,7 @@
 #include "CLHEP/GenericFunctions/AbsFunction.hh"
 
 namespace Genfun {
+  class Argument;
 
   /**
    * @author

diff --git a/GenericFunctions/src/ASin.cc b/GenericFunctions/src/ASin.cc
@@ -1,5 +1,6 @@
 // -*- C++ -*-
 // $Id: ASin.cc,v 1.4 2003/10/10 17:40:39 garren Exp $
+#include "CLHEP/GenericFunctions/AbsFunction.hh"
 #include "CLHEP/GenericFunctions/ASin.hh"
 #include "CLHEP/GenericFunctions/Sqrt.hh"
 #include "CLHEP/GenericFunctions/Square.hh"

diff --git a/GenericFunctions/src/AdaptiveRKStepper.cc b/GenericFunctions/src/AdaptiveRKStepper.cc
@@ -1,7 +1,10 @@
 #include "CLHEP/GenericFunctions/AdaptiveRKStepper.hh"
 #include "CLHEP/GenericFunctions/EmbeddedRKStepper.hh"
+
 #include <cmath>
 #include <stdexcept>
+#include <vector>
+
 namespace Genfun {
 
   AdaptiveRKStepper::AdaptiveRKStepper(const EEStepper *stepper):

diff --git a/GenericFunctions/src/AnalyticConvolution.cc b/GenericFunctions/src/AnalyticConvolution.cc
@@ -1,12 +1,15 @@
 // -*- C++ -*-
 // $Id: AnalyticConvolution.cc,v 1.8 2010/07/22 21:55:10 garren Exp $
+#include "CLHEP/GenericFunctions/AbsFunction.hh"
 #include "CLHEP/GenericFunctions/AnalyticConvolution.hh"
 #include "CLHEP/GenericFunctions/Gaussian.hh"
 #include "CLHEP/GenericFunctions/Exponential.hh"
 #include <cmath>	// for isfinite
 #if (defined _WIN32)
 #include <float.h> //  Visual C++ _finite
 #endif
+#include <iostream>
+
 namespace Genfun {
 FUNCTION_OBJECT_IMP(AnalyticConvolution)
 

diff --git a/GenericFunctions/src/ArrayFunction.cc b/GenericFunctions/src/ArrayFunction.cc
@@ -1,7 +1,10 @@
 // -*- C++ -*-
 // $Id: 
+#include "CLHEP/GenericFunctions/AbsFunction.hh"
 #include "CLHEP/GenericFunctions/ArrayFunction.hh"
 
+#include <vector>
+
 namespace Genfun {
 
 FUNCTION_OBJECT_IMP(ArrayFunction)

diff --git a/GenericFunctions/src/BetaDistribution.cc b/GenericFunctions/src/BetaDistribution.cc
@@ -4,6 +4,7 @@
 #include "CLHEP/GenericFunctions/BetaDistribution.hh"
 #include <assert.h>
 #include <cmath>
+#include <iostream>
 using namespace std;
 
 namespace Genfun {

diff --git a/GenericFunctions/src/BivariateGaussian.cc b/GenericFunctions/src/BivariateGaussian.cc
@@ -4,6 +4,7 @@
 #include "CLHEP/GenericFunctions/BivariateGaussian.hh"
 #include <assert.h>
 #include <cmath>      // for exp()
+#include <iostream>
 
 #if (defined __STRICT_ANSI__) || (defined _WIN32)
 #ifndef M_PI

diff --git a/GenericFunctions/src/DefiniteIntegral.cc b/GenericFunctions/src/DefiniteIntegral.cc
@@ -1,12 +1,13 @@
 // -*- C++ -*-
 // $Id: DefiniteIntegral.cc,v 1.6 2010/06/16 18:22:01 garren Exp $
 
+#include "CLHEP/GenericFunctions/AbsFunction.hh"
+#include "CLHEP/GenericFunctions/DefiniteIntegral.hh"
+
 #include <cmath>
+#include <iostream>
 #include <vector>
 #include <stdexcept>
-#include "CLHEP/GenericFunctions/DefiniteIntegral.hh"
-#include "CLHEP/GenericFunctions/AbsFunction.hh"
-
 
 namespace Genfun {
 

diff --git a/GenericFunctions/src/EfficiencyFunctional.cc b/GenericFunctions/src/EfficiencyFunctional.cc
@@ -5,6 +5,7 @@
 #include "CLHEP/GenericFunctions/AbsFunction.hh"
 #include <iostream>
 #include <cmath>      // for log()
+#include <vector>
 
 namespace Genfun {
 EfficiencyFunctional::EfficiencyFunctional(const ArgumentList & aList):

diff --git a/GenericFunctions/src/EmbeddedRKStepper.cc b/GenericFunctions/src/EmbeddedRKStepper.cc
@@ -1,6 +1,8 @@
 #include "CLHEP/GenericFunctions/EmbeddedRKStepper.hh"
 #include "CLHEP/GenericFunctions/ExtendedButcherTableau.hh"
 #include <stdexcept>
+#include <vector>
+
 namespace Genfun {
 
 

diff --git a/GenericFunctions/src/Exponential.cc b/GenericFunctions/src/Exponential.cc
@@ -3,6 +3,7 @@
 #include "CLHEP/GenericFunctions/Exponential.hh"
 #include <assert.h>
 #include <cmath>      // for exp()
+#include <iostream>
 
 namespace Genfun {
 FUNCTION_OBJECT_IMP(Exponential)

diff --git a/GenericFunctions/src/FunctionComposition.cc b/GenericFunctions/src/FunctionComposition.cc
@@ -2,6 +2,7 @@
 // $Id: FunctionComposition.cc,v 1.3 2003/09/06 14:04:14 boudreau Exp $
 #include "CLHEP/GenericFunctions/FunctionComposition.hh"
 #include <assert.h>
+#include <iostream>
 
 namespace Genfun {
 FUNCTION_OBJECT_IMP(FunctionComposition)

diff --git a/GenericFunctions/src/FunctionConvolution.cc b/GenericFunctions/src/FunctionConvolution.cc
@@ -2,6 +2,7 @@
 // $Id: FunctionConvolution.cc,v 1.3 2003/09/06 14:04:14 boudreau Exp $
 #include "CLHEP/GenericFunctions/FunctionConvolution.hh"
 #include <assert.h>
+#include <iostream>
 
 namespace Genfun {
 FUNCTION_OBJECT_IMP(FunctionConvolution)

diff --git a/GenericFunctions/src/FunctionDifference.cc b/GenericFunctions/src/FunctionDifference.cc
@@ -2,6 +2,7 @@
 // $Id: FunctionDifference.cc,v 1.3 2003/09/06 14:04:14 boudreau Exp $
 #include "CLHEP/GenericFunctions/FunctionDifference.hh"
 #include <assert.h>
+#include <iostream>
 
 namespace Genfun {
 FUNCTION_OBJECT_IMP(FunctionDifference)

diff --git a/GenericFunctions/src/FunctionDirectProduct.cc b/GenericFunctions/src/FunctionDirectProduct.cc
@@ -2,6 +2,7 @@
 // $Id: FunctionDirectProduct.cc,v 1.3 2003/09/06 14:04:14 boudreau Exp $
 #include "CLHEP/GenericFunctions/FunctionDirectProduct.hh"
 #include <assert.h>
+#include <iostream>
 
 namespace Genfun {
 FUNCTION_OBJECT_IMP(FunctionDirectProduct)

diff --git a/GenericFunctions/src/FunctionProduct.cc b/GenericFunctions/src/FunctionProduct.cc
@@ -2,6 +2,7 @@
 // $Id: FunctionProduct.cc,v 1.3 2003/09/06 14:04:14 boudreau Exp $
 #include "CLHEP/GenericFunctions/FunctionProduct.hh"
 #include <assert.h>
+#include <iostream>
 
 namespace Genfun {
 FUNCTION_OBJECT_IMP(FunctionProduct)

diff --git a/GenericFunctions/src/FunctionQuotient.cc b/GenericFunctions/src/FunctionQuotient.cc
@@ -2,6 +2,7 @@
 // $Id: FunctionQuotient.cc,v 1.3 2003/09/06 14:04:14 boudreau Exp $
 #include "CLHEP/GenericFunctions/FunctionQuotient.hh"
 #include <assert.h>
+#include <iostream>
 
 namespace Genfun {
 FUNCTION_OBJECT_IMP(FunctionQuotient)

diff --git a/GenericFunctions/src/FunctionSum.cc b/GenericFunctions/src/FunctionSum.cc
@@ -2,6 +2,7 @@
 // $Id: FunctionSum.cc,v 1.3 2003/09/06 14:04:14 boudreau Exp $
 #include "CLHEP/GenericFunctions/FunctionSum.hh"
 #include <assert.h>
+#include <iostream>
 
 namespace Genfun {
 FUNCTION_OBJECT_IMP(FunctionSum)

diff --git a/GenericFunctions/src/GammaDistribution.cc b/GenericFunctions/src/GammaDistribution.cc
@@ -4,6 +4,8 @@
 #include "CLHEP/GenericFunctions/GammaDistribution.hh"
 #include <assert.h>
 #include <cmath>
+#include <iostream>
+
 using namespace std;
 
 namespace Genfun {

diff --git a/GenericFunctions/src/Gaussian.cc b/GenericFunctions/src/Gaussian.cc
@@ -5,6 +5,7 @@
 #include "CLHEP/GenericFunctions/Variable.hh"
 #include <assert.h>
 #include <cmath>      // for exp()
+#include <iostream>
 
 #if (defined __STRICT_ANSI__) || (defined _WIN32)
 #ifndef M_PI

diff --git a/GenericFunctions/src/IncompleteGamma.cc b/GenericFunctions/src/IncompleteGamma.cc
@@ -4,6 +4,8 @@
 #include "CLHEP/GenericFunctions/IncompleteGamma.hh"
 #include <assert.h>
 #include <cmath>
+#include <iostream>
+
 using namespace std;
 
 namespace Genfun {

diff --git a/GenericFunctions/src/InterpolatingPolynomial.cc b/GenericFunctions/src/InterpolatingPolynomial.cc
@@ -4,6 +4,9 @@
 #include <cassert>
 #include <cmath>
 #include <cfloat>
+#include <iostream>
+#include <vector>
+
 namespace Genfun {
   FUNCTION_OBJECT_IMP(InterpolatingPolynomial)
 

diff --git a/GenericFunctions/src/Landau.cc b/GenericFunctions/src/Landau.cc
@@ -6,6 +6,7 @@
 #include "CLHEP/GenericFunctions/Variable.hh"
 #include <cmath>
 #include <assert.h>
+#include <iostream>
 
 using namespace std;
 

diff --git a/GenericFunctions/src/LikelihoodFunctional.cc b/GenericFunctions/src/LikelihoodFunctional.cc
@@ -7,6 +7,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <cmath>      // for log()
+#include <vector>
 
 namespace Genfun {
 LikelihoodFunctional::LikelihoodFunctional(const ArgumentList & aList):