fix: template specialization must go at the end

JeffersonLab · Sep 9, 2024 · 5534ff2 · 5534ff2
1 parent 0565963
commit 5534ff2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 37 deletions.
diff --git a/src/iguana/algorithms/meson.build b/src/iguana/algorithms/meson.build
@@ -172,7 +172,7 @@ algo_lib = shared_library(
   algo_sources,
   include_directories: [ project_inc ] + ROOT_dep_inc_dirs,
   dependencies: project_deps,
-  link_with: services_lib,
+  link_with: [ services_lib ],
   link_args: ROOT_dep_link_args,
   install: true,
   build_rpath: ROOT_dep_rpath,

diff --git a/src/iguana/services/ConcurrentParam.cc b/src/iguana/services/ConcurrentParam.cc
@@ -125,4 +125,37 @@ namespace iguana {
   {
     throw std::runtime_error("TODO: 'threadpool' model not yet implemented");
   }
+
+  // ==================================================================================
+  // template specializations
+  // ==================================================================================
+
+  template class ConcurrentParam<int>;
+  template class ConcurrentParam<double>;
+  template class ConcurrentParam<std::string>;
+  template class ConcurrentParam<std::vector<int>>;
+  template class ConcurrentParam<std::vector<double>>;
+  template class ConcurrentParam<std::vector<std::string>>;
+
+  template class SingleThreadParam<int>;
+  template class SingleThreadParam<double>;
+  template class SingleThreadParam<std::string>;
+  template class SingleThreadParam<std::vector<int>>;
+  template class SingleThreadParam<std::vector<double>>;
+  template class SingleThreadParam<std::vector<std::string>>;
+
+  template class MemoizedParam<int>;
+  template class MemoizedParam<double>;
+  template class MemoizedParam<std::string>;
+  template class MemoizedParam<std::vector<int>>;
+  template class MemoizedParam<std::vector<double>>;
+  template class MemoizedParam<std::vector<std::string>>;
+
+  template class ThreadPoolParam<int>;
+  template class ThreadPoolParam<double>;
+  template class ThreadPoolParam<std::string>;
+  template class ThreadPoolParam<std::vector<int>>;
+  template class ThreadPoolParam<std::vector<double>>;
+  template class ThreadPoolParam<std::vector<std::string>>;
+
 }
diff --git a/src/iguana/services/ConcurrentParam.h b/src/iguana/services/ConcurrentParam.h
@@ -69,7 +69,7 @@ namespace iguana {
 
     public:
       SingleThreadParam();
-      ~SingleThreadParam() {}
+      ~SingleThreadParam() override = default;
       T const Load(concurrent_key_t const key = 0) const override;
       void Save(T const& value, concurrent_key_t const key = 0) override;
       bool HasKey(concurrent_key_t const key) const override;
@@ -92,7 +92,7 @@ namespace iguana {
 
     public:
       MemoizedParam();
-      ~MemoizedParam() {}
+      ~MemoizedParam() override = default;
       T const Load(concurrent_key_t const key = 0) const override;
       void Save(T const& value, concurrent_key_t const key = 0) override;
       bool HasKey(concurrent_key_t const key) const override;
@@ -116,7 +116,7 @@ namespace iguana {
 
     public:
       ThreadPoolParam();
-      ~ThreadPoolParam() {}
+      ~ThreadPoolParam() override = default;
       T const Load(concurrent_key_t const key = 0) const override;
       void Save(T const& value, concurrent_key_t const key = 0) override;
       bool HasKey(concurrent_key_t const key) const override;
@@ -127,38 +127,6 @@ namespace iguana {
 
   };
 
-  // ==================================================================================
-  // template specializations
-  // ==================================================================================
-
-  template class ConcurrentParam<int>;
-  template class ConcurrentParam<double>;
-  template class ConcurrentParam<std::string>;
-  template class ConcurrentParam<std::vector<int>>;
-  template class ConcurrentParam<std::vector<double>>;
-  template class ConcurrentParam<std::vector<std::string>>;
-
-  template class SingleThreadParam<int>;
-  template class SingleThreadParam<double>;
-  template class SingleThreadParam<std::string>;
-  template class SingleThreadParam<std::vector<int>>;
-  template class SingleThreadParam<std::vector<double>>;
-  template class SingleThreadParam<std::vector<std::string>>;
-
-  template class MemoizedParam<int>;
-  template class MemoizedParam<double>;
-  template class MemoizedParam<std::string>;
-  template class MemoizedParam<std::vector<int>>;
-  template class MemoizedParam<std::vector<double>>;
-  template class MemoizedParam<std::vector<std::string>>;
-
-  template class ThreadPoolParam<int>;
-  template class ThreadPoolParam<double>;
-  template class ThreadPoolParam<std::string>;
-  template class ThreadPoolParam<std::vector<int>>;
-  template class ThreadPoolParam<std::vector<double>>;
-  template class ThreadPoolParam<std::vector<std::string>>;
-
   // ==================================================================================
   // ConcurrentParamFactory
   // ==================================================================================

diff --git a/src/iguana/tests/meson.build b/src/iguana/tests/meson.build
@@ -1,6 +1,6 @@
 test_exe_name = 'iguana_test'
 test_exe_inc = include_directories('include')
-test_exe_links = [ project_libs, vdor_lib ]
+test_exe_links = project_libs + [ vdor_lib ]
 
 test_exe = executable(
   test_exe_name,