From b4346edf4aee847e0f6e56801cda5e40e48f0b9e Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Thu, 5 Oct 2023 13:26:42 +0200
Subject: [PATCH] More constexpr changes

    * tao/x11/portable_server/servant_traits_t.h:
    * tao/x11/portable_server/servantbase.h:
---
 tao/x11/portable_server/servant_traits_t.h | 6 +++---
 tao/x11/portable_server/servantbase.h      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tao/x11/portable_server/servant_traits_t.h b/tao/x11/portable_server/servant_traits_t.h
index 0aba4ee9..a7311640 100644
--- a/tao/x11/portable_server/servant_traits_t.h
+++ b/tao/x11/portable_server/servant_traits_t.h
@@ -35,7 +35,7 @@ namespace TAOX11_NAMESPACE
 
     template <typename T, typename = typename
       std::enable_if<std::is_base_of<PortableServer::Servant, T>::value>::type, typename ...Args>
-    servant_reference<T> make_reference(Args&& ...args);
+    constexpr servant_reference<T> make_reference(Args&& ...args);
 
     template <typename T>
     class weak_servant_reference;
@@ -133,7 +133,7 @@ namespace TAOX11_NAMESPACE
       template <typename _Tp1> friend class valuetype_reference;
       template <typename _Tp1> friend class weak_valuetype_reference;
       template <typename _Tp1, typename, typename ...Args>
-      friend servant_reference<_Tp1> make_reference(Args&& ...args);
+      friend constexpr servant_reference<_Tp1> make_reference(Args&& ...args);
       friend class PortableServer::Servant;
 
       template <typename _Tp1>
@@ -232,7 +232,7 @@ namespace TAOX11_NAMESPACE
     };
 
     template <typename T, typename, typename ...Args>
-    inline servant_reference<T> make_reference(Args&& ...args)
+    inline constexpr servant_reference<T> make_reference(Args&& ...args)
     {
       return servant_reference<T> (new T (std::forward<Args> (args)...));
     }
diff --git a/tao/x11/portable_server/servantbase.h b/tao/x11/portable_server/servantbase.h
index 7b4c5032..ff8667c7 100644
--- a/tao/x11/portable_server/servantbase.h
+++ b/tao/x11/portable_server/servantbase.h
@@ -66,7 +66,7 @@ namespace TAOX11_NAMESPACE {
     protected:
       using _shared_ptr_type =_ref_type::shared_ptr_type;
       template <typename _Tp1, typename, typename ...Args>
-      friend CORBA::servant_reference<_Tp1> CORBA::make_reference(Args&& ...args);
+      friend constexpr CORBA::servant_reference<_Tp1> CORBA::make_reference(Args&& ...args);
 
       virtual ~Servant () = default;