detail

Author: andiwand

Core/include/Acts/EventData/SpacePointContainer2.hpp

@@ -10,6 +10,7 @@
 
 #include "Acts/EventData/SourceLink.hpp"
 #include "Acts/EventData/Types.hpp"
+#include "Acts/EventData/detail/SpacePointContainer2Column.hpp"
 #include "Acts/Utilities/EnumBitwiseOperators.hpp"
 #include "Acts/Utilities/TypeTraits.hpp"
 #include "Acts/Utilities/Zip.hpp"
@@ -874,50 +875,11 @@ class SpacePointContainer2 {
                      columns.data().subspan(range.first, range.second)...);
   }
 
-  class ColumnHolderBase {
-   public:
-    virtual ~ColumnHolderBase() = default;
-
-    virtual std::unique_ptr<ColumnHolderBase> copy() const = 0;
-
-    virtual std::size_t size() const = 0;
-    virtual void reserve(std::size_t size) = 0;
-    virtual void resize(std::size_t size) = 0;
-    virtual void clear() = 0;
-    virtual void emplace_back() = 0;
-  };
-
+ private:
+  using ColumnHolderBase = detail::sp::ColumnHolderBase;
   template <typename T>
-  class ColumnHolder final : public ColumnHolderBase {
-   public:
-    using Value = T;
-    using Container = std::vector<Value>;
-    using Proxy = SpacePointColumnProxy<Value>;
+  using ColumnHolder = detail::sp::ColumnHolder<T>;
 
-    ColumnHolder() = default;
-    explicit ColumnHolder(Value defaultValue)
-        : m_default(std::move(defaultValue)) {}
-
-    Proxy proxy(const SpacePointContainer2 &container) const {
-      return Proxy(container, m_data);
-    }
-
-    std::unique_ptr<ColumnHolderBase> copy() const override {
-      return std::make_unique<ColumnHolder<T>>(*this);
-    }
-
-    std::size_t size() const override { return m_data.size(); }
-    void reserve(std::size_t size) override { m_data.reserve(size); }
-    void clear() override { m_data.clear(); }
-    void resize(std::size_t size) override { m_data.resize(size, m_default); }
-    void emplace_back() override { m_data.emplace_back(m_default); }
-
-   private:
-    Value m_default{};
-    Container m_data;
-  };
-
- private:
   std::uint32_t m_size{0};
 
   std::unordered_map<

Core/include/Acts/EventData/detail/SpacePointContainer2Column.hpp

@@ -0,0 +1,69 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <memory>
+#include <vector>
+
+namespace Acts::Experimental {
+
+class SpacePointContainer2;
+template <typename T>
+class SpacePointColumnProxy;
+
+namespace detail::sp {
+
+// These classes should have gone into `SpacePointContainer2` but a compiler bug
+// prevents that
+
+class ColumnHolderBase {
+ public:
+  virtual ~ColumnHolderBase() = default;
+
+  virtual std::unique_ptr<ColumnHolderBase> copy() const = 0;
+
+  virtual std::size_t size() const = 0;
+  virtual void reserve(std::size_t size) = 0;
+  virtual void resize(std::size_t size) = 0;
+  virtual void clear() = 0;
+  virtual void emplace_back() = 0;
+};
+
+template <typename T>
+class ColumnHolder final : public ColumnHolderBase {
+ public:
+  using Value = T;
+  using Container = std::vector<Value>;
+  using Proxy = SpacePointColumnProxy<Value>;
+
+  ColumnHolder() = default;
+  explicit ColumnHolder(Value defaultValue)
+      : m_default(std::move(defaultValue)) {}
+
+  Proxy proxy(const SpacePointContainer2 &container) const {
+    return Proxy(container, m_data);
+  }
+
+  std::unique_ptr<ColumnHolderBase> copy() const override {
+    return std::make_unique<detail::sp::ColumnHolder<T>>(*this);
+  }
+
+  std::size_t size() const override { return m_data.size(); }
+  void reserve(std::size_t size) override { m_data.reserve(size); }
+  void clear() override { m_data.clear(); }
+  void resize(std::size_t size) override { m_data.resize(size, m_default); }
+  void emplace_back() override { m_data.emplace_back(m_default); }
+
+ private:
+  Value m_default{};
+  Container m_data;
+};
+
+}  // namespace detail::sp
+}  // namespace Acts::Experimental