summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2016-07-06 13:32:00 -0500
committerAdam Mitz <mitza@ociweb.com>2016-07-06 13:32:00 -0500
commit602c0b17174fd84710f8730ad905a9014ec1e84b (patch)
treeb481e2938798722706d56e756e1227c460c2d735
parentd5c050cf3f695138240ee423a1706ae43f7450df (diff)
downloadATCD-602c0b17174fd84710f8730ad905a9014ec1e84b.tar.gz
Fix bugzilla #4215: workaround for a compiler bug in vc14-update3
-rw-r--r--.gitignore1
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h10
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl11
3 files changed, 19 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index d4a2a896b1f..a2aed252e6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ ipch/
*.o
*.res
*.opendb
+*.VC.db
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);
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