summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl')
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl11
1 files changed, 10 insertions, 1 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
index ef6d7dc0d83..e0eb5496867 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
@@ -26,7 +26,7 @@ TAO_EC_Queue::
ACE_INLINE
TAO_EC_Dispatching_Task::
-TAO_EC_Dispatching_Task (ACE_Thread_Manager* thr_manager, TAO_EC_Queue_Full_Service_Object* so)
+TAO_EC_Dispatching_Task (ACE_Thread_Manager *thr_manager, TAO_EC_Queue_Full_Service_Object *so)
: ACE_Task<ACE_SYNCH> (thr_manager),
allocator_ (0),
the_queue_ (TAO_EC_QUEUE_HWM, TAO_EC_QUEUE_LWM),
@@ -35,6 +35,15 @@ TAO_EC_Dispatching_Task (ACE_Thread_Manager* thr_manager, TAO_EC_Queue_Full_Serv
this->msg_queue (&this->the_queue_);
}
+#ifdef ACE_WIN32_VC14
+// Work around for Connect #2869042 Bugzilla #4215
+ACE_INLINE
+TAO_EC_Dispatching_Task::
+TAO_EC_Dispatching_Task ()
+ : TAO_EC_Dispatching_Task (0, 0)
+{}
+#endif
+
// ****************************************************************
ACE_INLINE