From a1480384cc3233889d1f043fcd428c627843d272 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 3 Mar 2023 11:05:30 +0100
Subject: Add space to resolve compiler warnings on condaforge

    * ACE/ace/OS_NS_Thread.inl:
    * ACE/ace/OS_NS_unistd.inl:
---
 ACE/ace/OS_NS_Thread.inl | 2 +-
 ACE/ace/OS_NS_unistd.inl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 17335f782c5..e20c7077f88 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -534,7 +534,7 @@ ACE_OS::event_init (ACE_event_t *event,
 #endif /* ACE_HAS_WCHAR */
 
 ACE_INLINE long
-ACE_OS::priority_control (ACE_idtype_t /*idtype*/, ACE_id_t /*identifier*/, int /*cmd*/, void */*arg*/)
+ACE_OS::priority_control (ACE_idtype_t /*idtype*/, ACE_id_t /*identifier*/, int /*cmd*/, void * /*arg*/)
 {
   ACE_OS_TRACE ("ACE_OS::priority_control");
   ACE_NOTSUP_RETURN (-1);
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index 455192e4ee0..83f77073575 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -1019,7 +1019,7 @@ ACE_OS::sysconf (int name)
 }
 
 ACE_INLINE long
-ACE_OS::sysinfo (int /*cmd*/, char */*buf*/, long /*count*/)
+ACE_OS::sysinfo (int /*cmd*/, char * /*buf*/, long /*count*/)
 {
   ACE_OS_TRACE ("ACE_OS::sysinfo");
   ACE_NOTSUP_RETURN (0);
-- 
cgit v1.2.1


From 5f7f5729b3123c2f1c2874c6d560fba46a1749f1 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 3 Mar 2023 16:12:20 +0100
Subject: Prepare news file for next release

    * TAO/NEWS:
---
 TAO/NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/TAO/NEWS b/TAO/NEWS
index 23f0ed8a665..0039fcf71b6 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,3 +1,6 @@
+USER VISIBLE CHANGES BETWEEN TAO-3.1.0 and TAO-3.1.1
+====================================================
+
 USER VISIBLE CHANGES BETWEEN TAO-3.0.11 and TAO-3.1.0
 =====================================================
 
-- 
cgit v1.2.1