diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2023-03-03 17:00:58 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-03 17:00:58 +0100 |
commit | 1de7aa9a7e1d85c3de36248ee41a89a475e5811b (patch) | |
tree | 0d1d7e95a026495d44f98a7a2b7bbc68af34b663 | |
parent | 2a97fb9d6f9a4806afbcb5e327ce334006e4da69 (diff) | |
parent | 5f7f5729b3123c2f1c2874c6d560fba46a1749f1 (diff) | |
download | ATCD-1de7aa9a7e1d85c3de36248ee41a89a475e5811b.tar.gz |
Merge pull request #2060 from jwillemsen/jwi-condawarnings
Add space to resolve compiler warnings on condaforge
-rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 2 | ||||
-rw-r--r-- | ACE/ace/OS_NS_unistd.inl | 2 | ||||
-rw-r--r-- | TAO/NEWS | 3 |
3 files changed, 5 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); @@ -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 ===================================================== |