From 3043044d8ef02ef77def454fdede87927f5aa1f8 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 19 Dec 2022 16:19:21 +0200
Subject: [PATCH] Use bound loader function arguments for binary component
 types

---
 source/sourcepackage.cpp | 10 +++++-----
 source/sourcepackage.h   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 74c3886..6016271 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -180,9 +180,9 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions *o):
 	add("generate",    &Loader::generate);
 	add("install",     &Loader::component<InstallComponent>);
 	add("interface_version", &Loader::interface_version);
-	add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::LIBRARY>);
-	add("module",      &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::MODULE>);
-	add("program",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::PROGRAM>);
+	add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type>, BinaryComponent::LIBRARY);
+	add("module",      &Loader::component_arg<BinaryComponent, BinaryComponent::Type>, BinaryComponent::MODULE);
+	add("program",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type>, BinaryComponent::PROGRAM);
 	add("source_archive", &Loader::source_archive);
 	add("source_tarball", &Loader::source_archive);
 	add("tarball",     &Loader::tarball);
@@ -222,8 +222,8 @@ void SourcePackage::Loader::component(const string &n)
 	obj.components.push_back(comp);
 }
 
-template<typename C, typename A, A a>
-void SourcePackage::Loader::component_arg(const string &n)
+template<typename C, typename A>
+void SourcePackage::Loader::component_arg(A a, const string &n)
 {
 	C *comp = new C(obj, n, a);
 	load_sub(*comp);
diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index 68b89c8..fce58a6 100644
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -36,8 +36,8 @@ public:
 		void feature(const std::string &, const std::string &);
 		template<typename C>
 		void component(const std::string &);
-		template<typename C, typename A, A>
-		void component_arg(const std::string &);
+		template<typename C, typename A>
+		void component_arg(A, const std::string &);
 		void build_info();
 		void generate(const std::string &);
 		void interface_version(const std::string &);
-- 
2.43.0