blob: af338da6d5f421bb9c604bd0e1099ee01beec5d2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
patch written by GENSER to avoid system libraries of GLS coming from fastjet-config
--- include/Rivet/Tools/JetUtils.hh
+++ include/Rivet/Tools/JetUtils.hh
@@ -47,4 +47,5 @@
struct BoolJetFunctor {
virtual bool operator()(const Jet& p) const = 0;
+ virtual ~BoolJetFunctor() {}
};
--- include/Rivet/Tools/ParticleBaseUtils.hh
+++ include/Rivet/Tools/ParticleBaseUtils.hh
@@ -23,4 +23,5 @@
struct BoolParticleBaseFunctor {
virtual bool operator()(const ParticleBase& p) const = 0;
+ virtual ~BoolParticleBaseFunctor() {}
};
@@ -397,4 +398,5 @@
struct DoubleParticleBaseFunctor {
virtual double operator()(const ParticleBase& p) const = 0;
+ virtual ~DoubleParticleBaseFunctor() {}
};
--- include/Rivet/Tools/ParticleUtils.hh
+++ include/Rivet/Tools/ParticleUtils.hh
@@ -486,4 +486,5 @@
struct BoolParticleFunctor {
virtual bool operator()(const Particle& p) const = 0;
+ virtual ~BoolParticleFunctor() {}
};
--- src/Makefile.in.orig 2018-01-30 13:52:58.641670247 +0100
+++ src/Makefile.in 2018-01-30 13:53:19.377586118 +0100
@@ -449,7 +449,7 @@
libRivet_la_SOURCES =
libRivet_la_LDFLAGS = -export-dynamic -avoid-version -L$(YODALIBPATH) -L$(HEPMCLIBPATH)
libRivet_la_LIBADD = Core/libRivetCore.la Projections/libRivetProjections.la Tools/libRivetTools.la $(ANA_LIBADD) \
- -lYODA -lHepMC -ldl -lm $(FASTJETCONFIGLIBADD) $(GSL_LDFLAGS)
+ -lYODA -lHepMC -ldl -lm $(GSL_LDFLAGS) $(FASTJETCONFIGLIBADD)
all: all-recursive
|
