diff options
| author | Adam Mitz <mitza@ociweb.com> | 2016-07-06 13:32:00 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2016-07-06 13:32:00 -0500 |
| commit | 602c0b17174fd84710f8730ad905a9014ec1e84b (patch) | |
| tree | b481e2938798722706d56e756e1227c460c2d735 /TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h | |
| parent | d5c050cf3f695138240ee423a1706ae43f7450df (diff) | |
| download | ATCD-602c0b17174fd84710f8730ad905a9014ec1e84b.tar.gz | |
Fix bugzilla #4215: workaround for a compiler bug in vc14-update3
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index e32cd3ccc7b..edf7d0add56 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -96,8 +96,14 @@ protected: class TAO_RTEvent_Serv_Export TAO_EC_Dispatching_Task : public ACE_Task<ACE_SYNCH> { public: - /// Constructor - TAO_EC_Dispatching_Task (ACE_Thread_Manager* thr_manager = 0, TAO_EC_Queue_Full_Service_Object* queue_full_service_object = 0); + +#ifdef ACE_WIN32_VC14 + // Work around for Connect #2869042 Bugzilla #4215 + TAO_EC_Dispatching_Task (ACE_Thread_Manager *thr_manager, TAO_EC_Queue_Full_Service_Object *queue_full_service_object = 0); + TAO_EC_Dispatching_Task (); +#else + TAO_EC_Dispatching_Task (ACE_Thread_Manager *thr_manager = 0, TAO_EC_Queue_Full_Service_Object *queue_full_service_object = 0); +#endif /// Process the events in the queue. virtual int svc (void); |