From d64ae97f6865bc25d496485622530e2a090c2eb4 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 21 Aug 2019 12:11:48 +0200
Subject: Implement dynamic loading of build system modules

---
 libbuild2/function.hxx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'libbuild2/function.hxx')

diff --git a/libbuild2/function.hxx b/libbuild2/function.hxx
index 6b2bfe1..51c17c0 100644
--- a/libbuild2/function.hxx
+++ b/libbuild2/function.hxx
@@ -429,10 +429,10 @@ namespace build2
 #endif
   };
 
-  // Cast data/thunk.
+  // Cast data/thunk for functions.
   //
   template <typename R, typename... A>
-  struct function_cast
+  struct function_cast_func
   {
     // A pointer to a standard layout struct is a pointer to its first data
     // member, which in our case is the cast thunk.
@@ -468,7 +468,7 @@ namespace build2
   // argument.
   //
   template <typename R, typename... A>
-  struct function_cast<R, const scope*, A...>
+  struct function_cast_func<R, const scope*, A...>
   {
     struct data
     {
@@ -500,7 +500,7 @@ namespace build2
   // Specialization for void return type. In this case we return NULL value.
   //
   template <typename... A>
-  struct function_cast<void, A...>
+  struct function_cast_func<void, A...>
   {
     struct data
     {
@@ -528,7 +528,7 @@ namespace build2
   };
 
   template <typename... A>
-  struct function_cast<void, const scope*, A...>
+  struct function_cast_func<void, const scope*, A...>
   {
     struct data
     {
@@ -753,7 +753,7 @@ namespace build2
     operator= (R (*impl) (A...)) &&
     {
       using args = function_args<A...>;
-      using cast = function_cast<R, A...>;
+      using cast = function_cast_func<R, A...>;
 
       insert (move (name),
               function_overload (
@@ -770,7 +770,7 @@ namespace build2
     operator= (R (*impl) (const scope*, A...)) &&
     {
       using args = function_args<A...>;
-      using cast = function_cast<R, const scope*, A...>;
+      using cast = function_cast_func<R, const scope*, A...>;
 
       insert (move (name),
               function_overload (
-- 
cgit v1.1