From be45fa1b29c20694e5c828239d95b1b64130dd58 Mon Sep 17 00:00:00 2001 From: Sylvester Joosten <sylvester.joosten@gmail.com> Date: Mon, 2 Dec 2019 21:24:28 -0500 Subject: [PATCH] Fix ambigious inheritance for helicity logger --- .gitignore | 3 +++ src/.THcHelicity.h.swp | Bin 12288 -> 0 bytes src/THcHelicity.h | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 src/.THcHelicity.h.swp diff --git a/.gitignore b/.gitignore index e6569cf..fc73207 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ examples/cache work build* build/ + +*.swp +*.swo diff --git a/src/.THcHelicity.h.swp b/src/.THcHelicity.h.swp deleted file mode 100644 index 10beb64bad7783be8546cfa489f317789e088d43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 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 diff --git a/src/THcHelicity.h b/src/THcHelicity.h index 65c1bb0..9ee33f5 100644 --- a/src/THcHelicity.h +++ b/src/THcHelicity.h @@ -16,7 +16,7 @@ class TH1F; class THcHelicityScaler; -class THcHelicity : public hcana::ConfigLogging<THaHelicityDet>, public THcHelicityReader { +class THcHelicity : public THcHelicityReader { public: -- GitLab