Merge branch 'jwi-vs2022bug' of https://github.com/jwillemsen/ATCD into jwi-vs2022bug

Author: jwillemsen

ACE/NEWS

@@ -1,6 +1,9 @@
 USER VISIBLE CHANGES BETWEEN ACE-8.0.3 and ACE-8.0.4
 ====================================================
 
+. Fixed compile errors in the ACE core when compiled without thread
+  support (only core of ACE compiled and not tested)
+
 USER VISIBLE CHANGES BETWEEN ACE-8.0.2 and ACE-8.0.3
 ====================================================
 

ACE/ace/Priority_Reactor.cpp

@@ -7,7 +7,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 using QUEUE_ITERATOR = ACE_Unbounded_Queue_Iterator<ACE_Event_Tuple>;
 // Its iterator.
 
-using TUPLE_ALLOCATOR = ACE_Cached_Allocator<ACE_Node<ACE_Event_Tuple>, ACE_MT_SYNCH::NULL_MUTEX>;
+using TUPLE_ALLOCATOR = ACE_Cached_Allocator<ACE_Node<ACE_Event_Tuple>, ACE_SYNCH_NULL_MUTEX>;
 // Defines the memory allocator used, no need for locking because it
 // is only used in one thread of control.
 

ACE/ace/Service_Config.cpp

@@ -98,7 +98,7 @@ ACE_Threading_Helper<ACE_Null_Mutex>::get ()
   * know that upon process exit the SC will still be automaticaly and explicitly
   * closed by @c ACE_Object_Manager::fini().
   */
-using ACE_SERVICE_CONFIG_SINGLETON = ACE_Unmanaged_Singleton<ACE_Service_Config, ACE_MT_SYNCH::RECURSIVE_MUTEX>;
+using ACE_SERVICE_CONFIG_SINGLETON = ACE_Unmanaged_Singleton<ACE_Service_Config, ACE_SYNCH_RECURSIVE_MUTEX>;
 
 
 /// ctor

ACE/ace/Service_Types.cpp

@@ -11,9 +11,9 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-using MT_Stream = ACE_Stream<ACE_MT_SYNCH>;
-using MT_Module = ACE_Module<ACE_MT_SYNCH>;
-using MT_Task = ACE_Task<ACE_MT_SYNCH>;
+using MT_Stream = ACE_Stream<ACE_SYNCH>;
+using MT_Module = ACE_Module<ACE_SYNCH>;
+using MT_Task = ACE_Task<ACE_SYNCH>;
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Service_Type_Impl)
 

ACE/ace/Thread_Manager.cpp

@@ -1487,7 +1487,7 @@ ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status)
         if (ACE_OS::thr_equal (biter.next ()->thr_id_, tid))
           {
             std::unique_ptr<ACE_Thread_Descriptor_Base> tdbl (biter.advance_and_remove (false));
-            ace_mon.release();
+            ACE_MT (ace_mon.release());
 #ifndef ACE_LACKS_PTHREAD_JOIN
             if (ACE_Thread::join (tdbl->thr_handle_, status) == -1)
               {

TAO/TAO_IDL/ast/ast_map.cpp

@@ -377,7 +377,7 @@ AST_Map::destroy ()
 AST_Annotation_Appls &
 AST_Map::key_type_annotations ()
 {
-  return value_type_annotations_;
+  return key_type_annotations_;
 }
 
 void